From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 21 Nov 2017 20:32:57 +0000 (+0100)
Subject: build/ops: rpm: fix systemd macros for ceph-volume@.service
X-Git-Tag: v12.2.3~41^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93f13ab24cf2c54a183e90e23a4bddb4fe028da3;p=ceph.git

build/ops: rpm: fix systemd macros for ceph-volume@.service

Fixes: http://tracker.ceph.com/issues/22217
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d1f2df37dd03d77132e711423aacda46768d1e02)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 8298d627fd5..7a6281bb1a4 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1000,12 +1000,11 @@ rm -rf %{buildroot}
 %if 0%{?suse_version}
 %fillup_only
 if [ $1 -eq 1 ] ; then
-  /usr/bin/systemctl preset ceph-disk@\*.service ceph.target >/dev/null 2>&1 || :
+/usr/bin/systemctl preset ceph-disk@\*.service ceph-volume@\*.service ceph.target >/dev/null 2>&1 || :
 fi
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-%systemd_post ceph-disk@\*.service ceph.target
-%systemd_post ceph-volume@\*.service ceph.target
+%systemd_post ceph-disk@\*.service ceph-volume@\*.service ceph.target
 %endif
 if [ $1 -eq 1 ] ; then
 /usr/bin/systemctl start ceph.target >/dev/null 2>&1 || :
@@ -1013,11 +1012,10 @@ fi
 
 %preun base
 %if 0%{?suse_version}
-%service_del_preun ceph-disk@\*.service ceph.target
+%service_del_preun ceph-disk@\*.service ceph-volume@\*.service ceph.target
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-%systemd_preun ceph-disk@\*.service ceph.target
-%systemd_preun ceph-volume@\*.service ceph.target
+%systemd_preun ceph-disk@\*.service ceph-volume@\*.service ceph.target
 %endif
 
 %postun base
@@ -1025,10 +1023,10 @@ fi
 test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?suse_version}
 DISABLE_RESTART_ON_UPDATE="yes"
-%service_del_postun ceph-disk@\*.service ceph.target
+%service_del_postun ceph-disk@\*.service ceph-volume@\*.service ceph.target
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-%systemd_postun ceph-disk@\*.service ceph.target
+%systemd_postun ceph-disk@\*.service ceph-volume@\*.service ceph.target
 %endif
 if [ $FIRST_ARG -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to