[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] d/libvirt-daemon-config-{network, nwfilter}.postinst: reload libvirtd before restart

[Guido Günther]

Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
8173ce4b by Christian Ehrhardt at 2021-01-27T10:06:41+01:00
d/libvirt-daemon-config-{network,nwfilter}.postinst: reload libvirtd before restart

Without this upgrades will trigger a warning level log entry like:
  Setting up libvirt-daemon-config-network (7.0.0-1ubuntu1~ppa1) ...
  Warning: The unit file, source configuration file or drop-ins of
  libvirtd.service changed on disk. Run 'systemctl daemon-reload' to
  reload units.

This is due to our restart of libvirtd.service, after unpacking
libvirt-daemon-system (owning libvirtd.service) but before (order implied by
the dependencies from libvirt-daemon-system -> libvirt-daemon-config-network)
configuring libvirt-daemon-system which otherwise would do this reload.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -


2 changed files:

- debian/libvirt-daemon-config-network.postinst
- debian/libvirt-daemon-config-nwfilter.postinst


Changes:

=====================================
debian/libvirt-daemon-config-network.postinst
=====================================
@@ -104,6 +104,7 @@ case "$1" in
         # Since we might have changed the on-disk configuration for some
         # services, restart them so that they can pick up the new settings
         if [ -d /run/systemd/system ]; then
+            systemctl --system daemon-reload >/dev/null || true
             if systemctl is-active -q virtnetworkd; then
                 systemctl restart virtnetworkd
             fi


=====================================
debian/libvirt-daemon-config-nwfilter.postinst
=====================================
@@ -145,6 +145,7 @@ case "$1" in
         # Since we might have changed the on-disk configuration for some
         # services, restart them so that they can pick up the new settings
         if [ -d /run/systemd/system ]; then
+            systemctl --system daemon-reload >/dev/null || true
             if systemctl is-active -q virtnwfilterd; then
                 systemctl restart virtnwfilterd
             fi



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/8173ce4be0ab9269d28992d5d17673105e40b826

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/8173ce4be0ab9269d28992d5d17673105e40b826
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20210128/90729e29/attachment.html>