[Pkg-libvirt-commits] [libvirt] 01/01: Remove old restart handling code from postinst

[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 9be0bf966faaed83abcf9c4294a7209df57d8de4
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Feb 16 16:32:47 2014 +0100

    Remove old restart handling code from postinst
    
    This brings the dh_installinit calls in line with the dh_systemd_start
    calls.
    
    Closes: #739096
    Thanks: Laurent Bigonville
---
 debian/libvirt-bin.postinst | 22 ----------------------
 debian/rules                |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/libvirt-bin.postinst b/debian/libvirt-bin.postinst
index 78cd125..b3df139 100644
--- a/debian/libvirt-bin.postinst
+++ b/debian/libvirt-bin.postinst
@@ -96,28 +96,6 @@ case "$1" in
         add_users_groups
         add_statoverrides
 
-	# libvirt from 0.6.0 on is safe to restart with running vms:
-	if [ -n "$2" ] &&  dpkg --compare-versions "$2" ge 0.6.0; then
-	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                invoke-rc.d libvirt-bin stop
-            else
-                /etc/init.d/libvirt-bin stop
-            fi
-	    sleep 1
-	fi
-
-	if dpkg --compare-versions "$2" lt "0.6.1-2"; then
-	    if [ -e /etc/rc2.d/S20libvirt-bin ] && \
-	       [ -e /etc/rc3.d/S20libvirt-bin ] && \
-	       [ -e /etc/rc4.d/S20libvirt-bin ] && \
-	       [ -e /etc/rc5.d/S20libvirt-bin ] && \
-	       [ -e /etc/rc0.d/K20libvirt-bin ] && \
-	       [ -e /etc/rc1.d/K20libvirt-bin ] && \
-	       [ -e /etc/rc6.d/K20libvirt-bin ]; then
-		update-rc.d -f libvirt-bin remove >/dev/null
-	    fi
-	fi
-
 	# Make sure the directories don't get removed on package removal since
 	# logrotate chokes otherwise.
 	for dir in qemu uml lxc; do
diff --git a/debian/rules b/debian/rules
index 671ed12..700cc39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -156,7 +156,7 @@ override_dh_install:
 
 override_dh_installinit:
 	dh_systemd_enable
-	dh_installinit --name=libvirt-bin --no-restart-on-upgrade -- defaults 28 72
+	dh_installinit --name=libvirt-bin --restart-after-upgrade -- defaults 28 72
 	dh_installinit --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
 	dh_systemd_start --restart-after-upgrade
 

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