[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, master, updated. debian/0.6.1-1-6-g50258c1

[Guido Günther]

The following commit has been merged in the master branch:
commit 2a7cb3b80e7ebd9e5a6152cda4e470afc4b01118
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Apr 9 18:20:07 2009 +0200

    move startup of libvirtd after hal
    
    Closes: #522310

diff --git a/debian/libvirt-bin.init b/debian/libvirt-bin.init
index 3e418c0..28d7051 100755
--- a/debian/libvirt-bin.init
+++ b/debian/libvirt-bin.init
@@ -9,6 +9,7 @@
 # Provides:          libvirtd
 # Required-Start:    $network $local_fs
 # Required-Stop:     
+# Should-Start:      hal
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: libvirt management daemon
diff --git a/debian/libvirt-bin.postinst b/debian/libvirt-bin.postinst
index 9834b66..51998a3 100644
--- a/debian/libvirt-bin.postinst
+++ b/debian/libvirt-bin.postinst
@@ -31,6 +31,19 @@ case "$1" in
             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
     ;;
 
diff --git a/debian/rules b/debian/rules
index 48a062d..930e1e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ DEB_DBG_PACKAGES = libvirt0-dbg
 DEB_DBG_PACKAGE_libvirt0 = libvirt0-dbg
 DEB_PYTHON_SETUP_CMD := /dev/null
 DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.5.0)'
-DEB_DH_INSTALLINIT_ARGS := --no-restart-on-upgrade
+DEB_DH_INSTALLINIT_ARGS := --no-restart-on-upgrade -- defaults 28 72
 DEB_DH_INSTALLLOGROTATE_ARGS := --name=libvirtd
 
 EXAMPLES=debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/

-- 
Libvirt debian packaging