Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: vdsm.spec: replace if ! 0%{?with_systemd}
......................................................................
vdsm.spec: replace if ! 0%{?with_systemd}
Use positive validations based on 0%{?with_sysv}
Change-Id: I55a104a7ec6ed7ea57803157e9d62334a26caf7c
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
M vdsm.spec.in
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/03/23603/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index b0dc145..be82900 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -35,6 +35,8 @@
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%global with_systemd 1
+%else
+%global with_sysv 1
%endif
%if 0%{?fedora} >= 18
@@ -698,7 +700,7 @@
/sbin/restorecon -R /var/log/core >/dev/null 2>&1
# hack until we replace core dump with abrt
-%if ! 0%{?with_systemd}
+%if 0%{?with_sysv}
if [ "$1" -eq 1 ] ; then
/sbin/chkconfig --add vdsmd
/sbin/chkconfig --add supervdsmd
@@ -732,7 +734,7 @@
/bin/sed -i -e 's/# VDSM backup//' %{_sysconfdir}/logrotate.d/libvirtd
fi
-%if ! 0%{?with_systemd}
+%if 0%{?with_sysv}
if [ "$1" -eq 0 ]
then
/sbin/service vdsmd stop > /dev/null 2>&1 || :
@@ -810,7 +812,7 @@
fi
exit 0
-%if 0%{?rhel} == 6
+%if 0%{?with_sysv}
# In el6, We configure libvirt to use upstart without the libvirt.rpm's
# awareness. Thus, we must stop/restart libvirt ourselves when the
# libvirt.rpm is removed/upgraded.
@@ -826,7 +828,7 @@
%endif
%post reg
-%if ! 0%{?with_systemd}
+%if 0%{?with_sysv}
if [ "$1" -eq 1 ] ; then
/sbin/chkconfig --add vdsm-reg
fi
@@ -843,7 +845,7 @@
%endif
%preun reg
-%if ! 0%{?with_systemd}
+%if 0%{?with_sysv}
if [ "$1" -eq 0 ]
then
/sbin/service vdsm-reg stop > /dev/null 2>&1 || :
--
To view, visit http://gerrit.ovirt.org/23603
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55a104a7ec6ed7ea57803157e9d62334a26caf7c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
