[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, squeeze, updated. debian/1.2.1-3-2-g3fd1f6d

[Guido Günther]

The following commit has been merged in the squeeze branch:
commit 2ebaf59950f323bbaa4e91910712a655d8bea8ee
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Dec 31 14:31:17 2010 +0100

    Move corosync start out of rcS
    
    since we want to be able to log to syslog and rsyslog isn't started in
    rcS.
    
    Closes: #608269

diff --git a/debian/corosync.init b/debian/corosync.init
index c59c26f..67087de 100644
--- a/debian/corosync.init
+++ b/debian/corosync.init
@@ -4,7 +4,7 @@
 # Provides:          corosync
 # Required-Start:    $network $remote_fs $syslog
 # Required-Stop:     $network $remote_fs $syslog
-# Default-Start:     S
+# Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: corosync cluster framework
 ### END INIT INFO
diff --git a/debian/corosync.preinst b/debian/corosync.preinst
new file mode 100644
index 0000000..05a16d9
--- /dev/null
+++ b/debian/corosync.preinst
@@ -0,0 +1,35 @@
+#! /bin/sh
+# preinst script for corosync
+
+set -e
+
+case "$1" in
+    install)
+    ;;
+
+    upgrade)
+	if dpkg --compare-versions "$2" lt "1.2.1-4~"; then
+	    if [ -e /etc/rc0.d/K01corosync ] && \
+	       [ -e /etc/rc1.d/K01corosync ] && \
+	       [ -e /etc/rc6.d/K01corosync ] && \
+	       [ -e /etc/rcS.d/S20corosync ]; then
+		    rm /etc/rc[016].d/K01corosync
+		    rm /etc/rcS.d/S20corosync
+	    fi
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/rules b/debian/rules
index 5b63a73..34ea390 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ install: build
 	dh_installdirs
 	dh_installdocs
 	dh_installexamples
-	dh_installinit -p corosync -- start 59 S . stop 7 0 1 6 .
+	dh_installinit -p corosync -- defaults 19 1
 	dh_installlogrotate
 	dh_strip --dbg-package=corosync-dbg
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))

-- 
corosync Debian packaging