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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-03-26 20:10:56 +0000 (Sat, 26 Mar 2011)
New Revision: 3726

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/ctdb.init
Log:
ctdb.init: correct double quoting

An also various changes to match upstream

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-03-26 19:23:23 UTC (rev 3725)
+++ trunk/ctdb/debian/changelog	2011-03-26 20:10:56 UTC (rev 3726)
@@ -18,7 +18,7 @@
   * New package ctdb-dev, add the corresponding Breaks and Replaces
   * d/ctdb.init: updated
 
- -- Mathieu Parent <sathieu at debian.org>  Sat, 26 Mar 2011 19:55:05 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 26 Mar 2011 21:09:58 +0100
 
 ctdb (1.0.112-12-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2011-03-26 19:23:23 UTC (rev 3725)
+++ trunk/ctdb/debian/ctdb.init	2011-03-26 20:10:56 UTC (rev 3726)
@@ -247,34 +247,32 @@
 
     check_persistent_databases || return $?
 
-    if [ yes = "$CTDB_SUPPRESS_COREFILE" ]; then
+    if [ "$CTDB_SUPPRESS_COREFILE" = "yes" ]; then
 	ulimit -c 0
     else
 	ulimit -c unlimited
     fi
 
     case $init_style in
-        valgrind)
-	        valgrind -q --log-file=/var/log/ctdb/ctdb_valgrind.log \
-               $ctdbd --valgrinding $CTDB_OPTIONS
-	        RETVAL=$?
-	        echo
+	valgrind)
+	    eval valgrind -q --log-file=/var/log/ctdb/ctdb_valgrind.log \
+		$ctdbd --valgrinding "$CTDB_OPTIONS"
+	    RETVAL=$?
+	    echo
 	    ;;
-        suse)
-	        startproc $ctdbd $CTDB_OPTIONS
-	        rc_status -v
-	        RETVAL=$?
+	suse)
+	    eval startproc $ctdbd "$CTDB_OPTIONS"
+	    RETVAL=$?
 	    ;;
-        redhat)
-	        daemon $ctdbd $CTDB_OPTIONS
-	        RETVAL=$?
-	        echo
-	        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ctdb || RETVAL=1
+	redhat)
+	    eval $ctdbd "$CTDB_OPTIONS"
+	    RETVAL=$?
+	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ctdb || RETVAL=1
 	    ;;
-        debian)
-	        start-stop-daemon --start --quiet --background \
-	            --exec $ctdbd -- $CTDB_OPTIONS
-	        RETVAL=$?
+	debian)
+	    eval start-stop-daemon --start --quiet --background \
+		--exec $ctdbd -- "$CTDB_OPTIONS"
+	    RETVAL=$?
 	    ;;
     esac