[Pkg-libvirt-commits] [libvirt] 01/02: Don't restart virtlockd on upgrade

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch master
in repository libvirt.

commit a2ff23f39d55249a8e09e404b60b52803e46f38b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Aug 10 23:14:55 2014 +0200

    Don't restart virtlockd on upgrade
    
    virtlockd must be reloaded so it reexecs itself.
    
    Closes: #757453
---
 debian/libvirt-daemon-system.postinst | 3 +++
 debian/rules                          | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/libvirt-daemon-system.postinst b/debian/libvirt-daemon-system.postinst
index d911461..f7e456f 100644
--- a/debian/libvirt-daemon-system.postinst
+++ b/debian/libvirt-daemon-system.postinst
@@ -103,6 +103,9 @@ case "$1" in
 	done
         # Remove left over empty directory from pre 1.2.7
         [ ! -d /etc/apparmor.d/libvirtd ] || rmdir --ignore-fail-on-non-empty /etc/apparmor.d/libvirtd
+	
+        # Force virtlockd to reexec
+        [ -d /run/systemd/system ] && systemctl reload virtlockd.service
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/rules b/debian/rules
index 96ffa67..2d83d7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,7 +178,8 @@ override_dh_installinit:
 	dh_systemd_enable
 	dh_installinit -p libvirt-daemon-system --name=libvirtd --restart-after-upgrade -- defaults 28 72
 	dh_installinit -p libvirt-daemon-system --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
-	dh_systemd_start --restart-after-upgrade
+	dh_systemd_start --restart-after-upgrade libvirt-guests.service libvirtd.service
+	dh_systemd_start --no-restart-on-upgrade virtlockd.socket virtlockd.service
 
 override_dh_installdocs:
 	dh_installdocs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git