From d1f2df37dd03d77132e711423aacda46768d1e02 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 21 Nov 2017 21:32:57 +0100 Subject: [PATCH] build/ops: rpm: fix systemd macros for ceph-volume@.service Fixes: http://tracker.ceph.com/issues/22217 Signed-off-by: Nathan Cutler --- ceph.spec.in | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 5b5e9baf842..5c415d83ad4 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1002,12 +1002,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 || : @@ -1015,11 +1014,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 @@ -1027,10 +1025,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 -- 2.39.5