SOURCES: mysql-ndb.init, mysql-ndb-mgm.init, mysql-ndb-cpc.init - fixed for...

[qboosh]

Author: qboosh                       Date: Tue Nov  4 19:19:04 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed force-reload, added try-restart

---- Files affected:
SOURCES:
   mysql-ndb.init (1.3 -> 1.4) , mysql-ndb-mgm.init (1.3 -> 1.4) , mysql-ndb-cpc.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/mysql-ndb.init
diff -u SOURCES/mysql-ndb.init:1.3 SOURCES/mysql-ndb.init:1.4
--- SOURCES/mysql-ndb.init:1.3	Sat Oct 21 14:45:42 2006
+++ SOURCES/mysql-ndb.init	Tue Nov  4 20:18:57 2008
@@ -51,6 +51,16 @@
 	fi
 }
 
+condrestart() {
+	if [ -f /var/lock/subsys/mysql-ndb ]; then
+		stop
+		start
+	else
+		msg_not_running "mysql ndbd"
+		RETVAL=$1
+	fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -60,16 +70,22 @@
   stop)
   	stop
 	;;
-  restart|force-reload)
+  restart)
 	stop
 	start
 	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
+	;;
   status)
 	status ndbd
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac
 

================================================================
Index: SOURCES/mysql-ndb-mgm.init
diff -u SOURCES/mysql-ndb-mgm.init:1.3 SOURCES/mysql-ndb-mgm.init:1.4
--- SOURCES/mysql-ndb-mgm.init:1.3	Sat Oct 21 14:45:42 2006
+++ SOURCES/mysql-ndb-mgm.init	Tue Nov  4 20:18:58 2008
@@ -51,6 +51,16 @@
 	fi
 }
 
+condrestart() {
+	if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then
+		stop
+		start
+	else
+		msg_not_running "mysql ndb_mgmd"
+		RETVAL=$1
+	fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -60,16 +70,22 @@
   stop)
   	stop
 	;;
-  restart|force-reload)
+  restart)
 	stop
 	start
 	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
+	;;
   status)
 	status ndb_mgmd
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac
 

================================================================
Index: SOURCES/mysql-ndb-cpc.init
diff -u SOURCES/mysql-ndb-cpc.init:1.3 SOURCES/mysql-ndb-cpc.init:1.4
--- SOURCES/mysql-ndb-cpc.init:1.3	Sat Oct 21 14:45:42 2006
+++ SOURCES/mysql-ndb-cpc.init	Tue Nov  4 20:18:58 2008
@@ -51,6 +51,16 @@
 	fi
 }
 
+condrestart() {
+	if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then
+		stop
+		start
+	else
+		msg_not_running "mysql ndb_cpcd"
+		RETVAL=$1
+	fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -60,16 +70,22 @@
   stop)
   	stop
 	;;
-  restart|force-reload)
+  restart)
 	stop
 	start
 	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
+	;;
   status)
 	status ndb_cpcd
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysql-ndb.init?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysql-ndb-mgm.init?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysql-ndb-cpc.init?r1=1.3&r2=1.4&f=u