From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 16 Apr 2015 19:42:05 +0000 (-0400)
Subject: spec: If installing default network, restart libvirtd
X-Git-Tag: v1.3.3.1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55a1671362719c98cc4ff9ea9aafad0d12a60ba1;p=thirdparty%2Flibvirt.git

spec: If installing default network, restart libvirtd

If libvirt-daemon-config-network is installed while libvirtd is already
running, the daemon doesn't notice the network. Users then have to
manually restart libvirtd (or reboot) to pick up the network.

Instead let's trigger a daemon restart when the package is first installed.
Then the default network is available immediately if libvirtd was already
running.

https://bugzilla.redhat.com/show_bug.cgi?id=867546
(cherry picked from commit 1d4400082a02c41b152cc9ab7b4cfc428cc527ee)
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index c60f25171b..682f274af7 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1846,6 +1846,14 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
          < %{_datadir}/libvirt/networks/default.xml \
          > %{_sysconfdir}/libvirt/qemu/networks/default.xml
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+
+    # Make sure libvirt picks up the new network defininiton
+      %if %{with_systemd}
+    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 ||:
+      %else
+    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
+      %endif
+
 fi
     %endif