From: Daniel P. Berrangé <berrange@redhat.com>
Date: Wed, 28 Jul 2021 15:29:49 +0000 (+0100)
Subject: rpm: restart virtnwfilter/virnetworkd if configs change
X-Git-Tag: v7.7.0-rc1~297
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2eafaf7a30248d5ac9bc0557e727353bf8669e1;p=thirdparty%2Flibvirt.git

rpm: restart virtnwfilter/virnetworkd if configs change

Currently we restart libvirtd if the nwfilter/network configs have
changed. We need to take account of possibility that the modular
daemons are in use instead though.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 1d657aec35..c00d4c73da 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1404,10 +1404,12 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
 
     # Make sure libvirt picks up the new network defininiton
     %libvirt_daemon_schedule_restart libvirtd
+    %libvirt_daemon_schedule_restart virtnetworkd
 fi
 
 %posttrans daemon-config-network
 %libvirt_daemon_perform_restart libvirtd
+%libvirt_daemon_perform_restart virtnetworkd
 
 %post daemon-config-nwfilter
 for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do
@@ -1419,9 +1421,11 @@ for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do
 done
 # Make sure libvirt picks up the new nwfilter defininitons
 %libvirt_daemon_schedule_restart libvirtd
+%libvirt_daemon_schedule_restart virtnwfilterd
 
 %posttrans daemon-config-nwfilter
 %libvirt_daemon_perform_restart libvirtd
+%libvirt_daemon_perform_restart virtnwfilterd
 
 %if %{with_qemu}
 %pre daemon-driver-qemu