Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17927/scripts/scripts
Modified Files:
mysqld
Log Message:
Fix "stop" portion of mysql init.d script, and more BScap crap in firewall.
Index: mysqld
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/mysqld,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mysqld 10 Aug 2005 13:48:50 -0000 1.9
+++ mysqld 10 Aug 2005 20:38:51 -0000 1.10
@@ -45,17 +45,25 @@
case "$1" in
start)
- if [ ! -d $DATADIR ]; then
- echo "Initializing new $NAME data dir: "
- #mkdir -p $DATADIR
- mysql_install_db $MYSQL_PARM
+ if [ "${MYSQL_PARM}" != "${MYSQL_PARM/--datadir=\//}" ]; then
+ DATADIR=${MYSQL_PARM##*--datadir=}
+ DATADIR=${DATADIR%% *}
+ [ ! -e ${DATADIR:-/var/mysql} ] && mkdir -p ${DATADIR:-/var/mysql}
+ if [ ! -d ${DATADIR:-/var/mysql}/mysql ]; then
+ echo "Initializing new $NAME data dir: "
+ mysql_install_db $MYSQL_PARM
+ fi
fi
echo "Starting $NAME: "
$DAEMON $MYSQL_PARM &> /dev/null &
;;
stop)
+ if [ "${MYSQL_PARM}" != "${MYSQL_PARM/--pid-file=\//}" ]; then
+ PIDFILE=${MYSQL_PARM##*--pid-file=}
+ PIDFILE=${DATADIR%% *}
+ fi
echo -n "Shutting down $NAME: "
- if [ -f $PIDFILE ]; then
+ if [ -f ${PIDFILE:=/var/run/mysql.pid} ]; then
kill $(cat $PIDFILE)
sleep 1
|
