From: Owen Synge <osynge@suse.com>
Date: Fri, 31 Jul 2015 11:15:02 +0000 (+0200)
Subject: ceph.spec.in:fixup bad merge of systemd logic
X-Git-Tag: v9.1.0~439^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3e9548bba534315fda93dafa01803d7e0577361;p=ceph.git

ceph.spec.in:fixup bad merge of systemd logic
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 7edea1adbc33..4ed5480acc11 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -18,13 +18,6 @@
 # /var/run/ceph.
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} > 1300
 %global _with_systemd 1
-
-# Use systemd files when possible.
-%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version}
-  %global _with_systemd 1
-  %if 0%{?rhel} || 0%{?fedora}
-    %global _unitdir /usr/lib/systemd/system
-  %endif
 %endif
 
 Name:		ceph
@@ -556,6 +549,7 @@ install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
   install -m 0644 -D systemd/ceph-disk-activate-journal@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-disk-activate-journal@.service
   install -m 0644 -D systemd/ceph-disk-activate@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-disk-activate@.service
   install -m 0644 -D systemd/ceph-disk-dmcrypt-activate@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-disk-dmcrypt-activate@.service
+  install -m 0755 -D systemd/ceph $RPM_BUILD_ROOT%{_sbindir}/rcceph
 %else
   install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
   install -D src/init-radosgw $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw