| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182 |
- diff --git a/package/mysql/S97mysqld b/package/mysql/S97mysqld
- index b8d90d1..9e7d60a 100644
- --- a/package/mysql/S97mysqld
- +++ b/package/mysql/S97mysqld
- @@ -6,8 +6,8 @@ MYSQL_USER="mysql"
- [ -r /etc/default/mysql ] && . /etc/default/mysql
-
- case "$1" in
- - start)
- - if [ ! -d $MYSQL_DIR/mysql ] ; then
- + start)
- + if [ ! -d $MYSQL_DIR/mysql ]; then
- #--- my.cnf for GfA ---
- (\
- cat << EOF
- @@ -20,32 +20,38 @@ innodb_strict_mode=1
- EOF
- ) > /etc/my.cnf
- #----------------------
- - echo "Creating MySQL system tables..."
- - mysql_install_db --user=$MYSQL_USER --ldata=$MYSQL_DIR
- - fi
- -
- - # mysqld runs as user mysql, but /run is only writable by root
- - # so create a subdirectory for mysql.
- - install -d -o mysql -g root -m 0755 /run/mysql
- -
- - # We don't use start-stop-daemon because mysqld has
- - # its own wrapper script.
- - printf "Starting mysql..."
- - /usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid &
- - echo "done."
- - ;;
- - stop)
- - printf "Stopping mysql..."
- - if test -f /run/mysql/mysqld.pid ; then
- - kill `cat /run/mysql/mysqld.pid`
- - fi
- - echo "done."
- - ;;
- - restart)
- - $0 stop
- - $0 start
- - ;;
- - *)
- - echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
- - ;;
- + echo "Creating MySQL system tables..."
- + mysql_install_db --user=$MYSQL_USER --ldata=$MYSQL_DIR
- +
- + install -d -o mysql -g root -m 0755 /run/mysql
- +
- + printf "Starting mysql..."
- + /usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid &
- +
- + until mysql -u root -h localhost -e 'select 1;' 2>/dev/null; do echo "..>>"; sleep 1; done
- +
- + mysqladmin -u root password "root"
- + printf "set root pwd"
- + else
- + install -d -o mysql -g root -m 0755 /run/mysql
- + printf "Starting mysql..."
- + /usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid &
- + fi
- + echo "done."
- + ;;
- + stop)
- + printf "Stopping mysql..."
- + if test -f /run/mysql/mysqld.pid ; then
- + kill `cat /run/mysql/mysqld.pid`
- + fi
- + echo "done."
- + ;;
- + restart)
- + $0 stop
- + $0 start
- + ;;
- + *)
- + echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
- + ;;
- esac
- +
|
