Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsm.spec: specify sysV commands for EL6 only ......................................................................
vdsm.spec: specify sysV commands for EL6 only To provide EL7 builds we must update the spec to not include sysV commands for EL7 builds since it uses systemd. Change-Id: Ie52ae97d48d795d53529152b68380fbd13d7927d Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1051860 Signed-off-by: Douglas Schilling Landgraf <dougsl...@redhat.com> --- M vdsm.spec.in 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/23235/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 93784bf..afc94d3 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -697,7 +697,7 @@ /sbin/restorecon -R /var/log/core >/dev/null 2>&1 # hack until we replace core dump with abrt -%if 0%{?rhel} +%if 0%{?rhel} == 6 if [ "$1" -eq 1 ] ; then /sbin/chkconfig --add vdsmd /sbin/chkconfig --add supervdsmd @@ -733,7 +733,7 @@ /bin/sed -i -e 's/# VDSM backup//' %{_sysconfdir}/logrotate.d/libvirtd fi -%if 0%{?rhel} +%if 0%{?rhel} == 6 if [ "$1" -eq 0 ] then /sbin/service vdsmd stop > /dev/null 2>&1 || : @@ -804,17 +804,25 @@ %if 0%{?rhel} %triggerun -- libvirt if [ "$2" -eq "0" ]; then +%if 0%{?rhel} == 6 /sbin/initctl stop libvirtd > /dev/null 2>&1 || : +%else + /bin/systemctl stop libvirtd.service > /dev/null 2>&1 || : +%endif fi %triggerpostun -- libvirt if [ "$2" -ge "1" ]; then +%if 0%{?rhel} == 6 /sbin/initctl restart libvirtd > /dev/null 2>&1 || : +%else + /bin/systemctl restart libvirtd.service > /dev/null 2>&1 || : +%endif fi %endif %post reg -%if 0%{?rhel} +%if 0%{?rhel} == 6 if [ "$1" -eq 1 ] ; then /sbin/chkconfig --add vdsm-reg fi @@ -831,7 +839,7 @@ %endif %preun reg -%if 0%{?rhel} +%if 0%{?rhel} == 6 if [ "$1" -eq 0 ] then /sbin/service vdsm-reg stop > /dev/null 2>&1 || : -- To view, visit http://gerrit.ovirt.org/23235 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie52ae97d48d795d53529152b68380fbd13d7927d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsl...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
