[libvirt] [PATCH] spec: fix trigger already defined issue on systems without systemd
Jean-Marc Liger
jean-marc.liger at parisdescartes.fr
Tue Mar 29 14:48:17 UTC 2016
Le 11/03/2016 15:18, Jean-Marc LIGER a écrit :
> There is a trigger already defined issue when you try to rebuild
> libvirt >= 1.3.0 for el6 with copr and most probably koji.
>
> Regards,
> Jean-Marc
>
> diff -uri a/libvirt.spec.in b/libvirt.spec.in
> --- a/libvirt.spec.in 2016-03-01 04:21:48.000000000 +0100
> +++ b/libvirt.spec.in 2016-03-11 14:57:43.347652313 +0100
> @@ -1767,16 +1767,6 @@
> fi
> %endif
>
> - %if %{with_systemd}
> - %else
> -%triggerpostun daemon -- libvirt-daemon < 1.2.1
> -if [ "$1" -ge "1" ]; then
> - /sbin/service virtlockd reload > /dev/null 2>&1 || :
> - /sbin/service virtlogd reload > /dev/null 2>&1 || :
> - /sbin/service libvirtd condrestart > /dev/null 2>&1
> -fi
> - %endif
> -
> # In upgrade scenario we must explicitly enable virtlockd/virtlogd
> # sockets, if libvirtd is already enabled and start them if
> # libvirtd is running, otherwise you'll get failures to start
> @@ -1789,6 +1779,12 @@
> /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
> /bin/systemctl start virtlogd.socket || :
> %else
> + %triggerpostun daemon -- libvirt-daemon < 1.2.1
> + if [ "$1" -ge "1" ]; then
> + /sbin/service virtlockd reload > /dev/null 2>&1 || :
> + /sbin/service virtlogd reload > /dev/null 2>&1 || :
> + /sbin/service libvirtd condrestart > /dev/null 2>&1
> + fi
> /sbin/chkconfig libvirtd 1>/dev/null 2>&1 &&
> /sbin/chkconfig virtlogd on || :
> /sbin/service libvirtd status 1>/dev/null 2>&1 &&
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
I've modified my patch after the nss update, someone could revue this
patch before the next release ?
Regards,
Jean-Marc
diff -uri a/libvirt.spec.in b/libvirt.spec.in
--- a/libvirt.spec.in 2016-03-29 16:40:37.985927719 +0200
+++ b/libvirt.spec.in 2016-03-29 16:28:01.808864888 +0200
@@ -1783,16 +1783,6 @@
fi
%endif
- %if %{with_systemd}
- %else
-%triggerpostun daemon -- libvirt-daemon < 1.2.1
-if [ "$1" -ge "1" ]; then
- /sbin/service virtlockd reload > /dev/null 2>&1 || :
- /sbin/service virtlogd reload > /dev/null 2>&1 || :
- /sbin/service libvirtd condrestart > /dev/null 2>&1
-fi
- %endif
-
# In upgrade scenario we must explicitly enable virtlockd/virtlogd
# sockets, if libvirtd is already enabled and start them if
# libvirtd is running, otherwise you'll get failures to start
@@ -1805,6 +1795,12 @@
/bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
/bin/systemctl start virtlogd.socket || :
%else
+ %triggerpostun daemon -- libvirt-daemon < 1.2.1
+ if [ "$1" -ge "1" ]; then
+ /sbin/service virtlockd reload > /dev/null 2>&1 || :
+ /sbin/service virtlogd reload > /dev/null 2>&1 || :
+ /sbin/service libvirtd condrestart > /dev/null 2>&1
+ fi
/sbin/chkconfig libvirtd 1>/dev/null 2>&1 &&
/sbin/chkconfig virtlogd on || :
/sbin/service libvirtd status 1>/dev/null 2>&1 &&
More information about the libvir-list
mailing list