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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-06-23 17:12:59 +0000 (Tue, 23 Jun 2009)
New Revision: 2911

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/ctdb.init
Log:
- New upstream version 1.0.85
- Initscript fixes


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-06-23 07:16:08 UTC (rev 2910)
+++ trunk/ctdb/debian/changelog	2009-06-23 17:12:59 UTC (rev 2911)
@@ -1,10 +1,12 @@
-ctdb (1.0.84-1) UNRELEASED; urgency=low
+ctdb (1.0.85-1) UNRELEASED; urgency=low
 
   * new upstream release
-    - update ctdb.init (obsolete ipmux component removed)
+    - update ctdb.init:
+      + obsolete ipmux component removed
+      + Initscript fixes
   * Bump standards version to 3.8.2 (no changes needed) 
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Jun 2009 22:42:21 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 23 Jun 2009 19:10:21 +0200
 
 ctdb (1.0.82-2) unstable; urgency=low
 

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2009-06-23 07:16:08 UTC (rev 2910)
+++ trunk/ctdb/debian/ctdb.init	2009-06-23 17:12:59 UTC (rev 2911)
@@ -161,7 +161,7 @@
 }
 
 running() {
-    ctdb ping > /dev/null 2>&1 || return 1
+    pkill -0 -f $DAEMON || return 1
     return 0
 }
 
@@ -188,22 +188,24 @@
 
 	case $init_style in
 	    valgrind)
-		valgrind -q --log-file=/var/log/ctdb_valgrind /usr/sbin/ctdbd --nosetsched $CTDB_OPTIONS 
+		valgrind -q --log-file=/var/log/ctdb_valgrind \
+		    $DAEMON --nosetsched $CTDB_OPTIONS 
 		RETVAL=0
 		;;
 	    suse)
-		startproc /usr/sbin/ctdbd $CTDB_OPTIONS
+		startproc $DAEMON $CTDB_OPTIONS
 		rc_status -v
 		RETVAL=$?
 		;;
 	    redhat)
-		daemon ctdbd $CTDB_OPTIONS
+		daemon $DAEMON $CTDB_OPTIONS
 		RETVAL=$?
 		echo
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ctdb || RETVAL=1
 		;;
 	    ubuntu)
-		start-stop-daemon --start --quiet --background --exec /usr/sbin/ctdbd -- $CTDB_OPTIONS
+		start-stop-daemon --start --quiet --background \
+		    --exec $DAEMON -- $CTDB_OPTIONS
 		RETVAL=$?
 		;;
 	esac
@@ -221,24 +223,19 @@
 }	
 
 stop_server() {
-	ctdb shutdown
+	ctdb shutdown >/dev/null 2>&1
 	RETVAL=$?
 	count=0
-	if [ "$init_style" = "valgrind" ]; then
-	    # very crude method
-	    sleep 2
-	    pkill -9 -f valgrind
-	else if [ "$init_style" = "ubuntu" ]; then
-            start-stop-daemon --stop --quiet --exec /usr/sbin/ctdbd
+	if [ "$init_style" = "ubuntu" ]; then
+            start-stop-daemon --stop --quiet --exec $DAEMON
             RETVAL=$?
-        fi
 	fi
-	while killall -q -0 ctdbd; do
+	while pkill -0 -f $DAEMON ; do
 	    sleep 1
 	    count=`expr $count + 1`
 	    [ $count -gt 10 ] && {
 		eval_gettext "killing ctdbd "
-		killall -q -9 ctdbd
+		pkill -9 -f $DAEMON
 		pkill -9 -f $CTDB_BASE/events.d/
 	    }
 	done