[Devil-linux-commit] build/scripts/scripts mysqld,1.4,1.5

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv10602/scripts/scripts

Modified Files:
	mysqld 
Log Message:
added some more intelligence to init script


Index: mysqld
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/mysqld,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mysqld	23 Dec 2003 02:29:26 -0000	1.4
+++ mysqld	26 Dec 2003 23:50:27 -0000	1.5
@@ -51,8 +51,35 @@
 		$DAEMON $PARAMETER &> /dev/null &
 		;;
 	stop)
-		echo  "Shutting down $NAME: "
-		kill $(cat $PIDFILE)
+		echo -n "Shutting down $NAME: "
+		if [ -f $PIDFILE ]; then
+			kill $(cat $PIDFILE)
+			sleep 1
+
+			getpids $DAEMON
+
+			if [ -n "$pidlist" ]; then
+				echo
+				echo -n "Waiting for MySQLd to shutdown"
+			fi
+
+			i=60
+			while [ -n "$pidlist" ] && [ $i -gt 0 ] ; do
+				echo -n "."
+				sleep 5
+				i=$[$i-5]
+				getpids $DAEMON
+			done
+
+			if [ -n "$pidlist" ]; then
+				print_status failure
+			else
+				print_status success
+			fi
+		else
+			print_status warning
+			echo "Service doesn't seem to be running"
+		fi
 		;;
 	restart)
 		$0 stop