[Pkg-samba-maint] r3142 - trunk/ctdb/debian

[sathieu at alioth.debian.org]

tags 560385 pending
thanks

Author: sathieu
Date: 2009-12-10 20:22:14 +0000 (Thu, 10 Dec 2009)
New Revision: 3142

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/ctdb.init
Log:
Fix "auto init style detection fails with debians init script"
    by replacing ubuntu by debian in the initscript (Closes: #560385)

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-12-10 16:54:44 UTC (rev 3141)
+++ trunk/ctdb/debian/changelog	2009-12-10 20:22:14 UTC (rev 3142)
@@ -1,3 +1,10 @@
+ctdb (1.0.108-2) UNRELEASED; urgency=low
+
+  * Fix "auto init style detection fails with debians init script"
+    by replacing ubuntu by debian in the initscript (Closes: #560385)
+
+ -- Mathieu Parent <sathieu at debian.org>  Thu, 10 Dec 2009 21:21:14 +0100
+
 ctdb (1.0.108-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2009-12-10 16:54:44 UTC (rev 3141)
+++ trunk/ctdb/debian/ctdb.init	2009-12-10 20:22:14 UTC (rev 3142)
@@ -176,7 +176,7 @@
 
 check_persistent_databases () {
     case $init_style in
-        ubuntu) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/lib/ctdb}/persistent" ;;
+        debian) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/lib/ctdb}/persistent" ;;
         *) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/ctdb}/persistent" ;;
     esac
     mkdir -p $PERSISTENT_DB_DIR 2>/dev/null
@@ -236,7 +236,7 @@
 	        echo
 	        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ctdb || RETVAL=1
 	    ;;
-        ubuntu)
+        debian)
 	        start-stop-daemon --start --quiet --background \
 	            --exec $ctdbd -- $CTDB_OPTIONS
 	        RETVAL=$?
@@ -254,7 +254,7 @@
     ctdb shutdown >/dev/null 2>&1
     RETVAL=$?
     count=0
-    if [ "$init_style" = "ubuntu" ]; then
+    if [ "$init_style" = "debian" ]; then
         start-stop-daemon --stop --quiet --exec $ctdbd
         RETVAL=$?
     fi