mysql: further init script cleanup

SVN-Revision: 24567

diff --git a/libs/mysql/files/mysqld.init b/libs/mysql/files/mysqld.init
index e3088a342deb10505b524191159eb07a2229a62e..32fe7b214fece7c41c7f6f504dd62aa53af0fa41 100644 (file)
--- a/libs/mysql/files/mysqld.init
+++ b/libs/mysql/files/mysqld.init
@@ -1,27 +1,29 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2010 OpenWrt.org
+
 START=95
 STOP=10
 
-
 PID=/var/run/mysqld.pid
 CMD=/usr/bin/mysqld
 
 start() {
-    DATADIR=`grep datadir /etc/my.cnf | cut -f 2 -d =`
-    if [ !  -d $DATADIR ]; then
-       echo "Error: datadir in /etc/my.cnf ($DATADIR) doesn't exist"
-       return 1
-    elif [ ! -f $DATADIR/mysql/tables_priv.MYD ]; then
+       local datadir=$(sed -n -e 's/^[[:space:]]*datadir[[:space:]]*=[[:space:]]*//p' /etc/my.cnf)
+       if [ ! -d "$datadir" ]; then
+               echo "Error: datadir in /etc/my.cnf ($datadir) doesn't exist"
+               return 1
+       elif [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then
                echo "Error: I didn't detect a privileges table, you might need to run mysql_install_db --force to initialize the system tables"
                return 1
-    else
+       else
+               echo -n "Starting MySQL daemon... "
                start-stop-daemon -x $CMD -b -S -- --pid-file=$PID
-    fi
+               echo "done"
+       fi
 }
 
 stop() {
-    echo -n "Stopping Mysqld..."
-    service_kill ${CMD##*/} $PID
-    echo "done"
+       echo -n "Stopping MySQL daemon... "
+       service_kill ${CMD##*/} $PID
+       echo "done"
 }