From 3bbf01869f16f48667f6097f51871e058e4e3b7b Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Mon, 3 Feb 2020 17:21:57 -0800 Subject: [PATCH] package/mariadb: rename MYSQL_PID variable in sysv startup script For consistency with the to-be-added MYSQL_LOGFILE variable. Signed-off-by: Ryan Coe Signed-off-by: Peter Korsgaard --- package/mariadb/S97mysqld | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mariadb/S97mysqld b/package/mariadb/S97mysqld index 7f9ced31e9..ffd3712400 100644 --- a/package/mariadb/S97mysqld +++ b/package/mariadb/S97mysqld @@ -5,7 +5,7 @@ MYSQL_LIB="/var/lib/mysql" MYSQL_RUN="/run/mysql" -MYSQL_PID="$MYSQL_RUN/mysqld.pid" +MYSQL_PIDFILE="$MYSQL_RUN/mysqld.pid" MYSQL_BIN="/usr/bin" wait_for_ready() { @@ -41,7 +41,7 @@ start() { # We don't use start-stop-daemon because mysqld has its own # wrapper script. printf "Starting mysql ... " - $MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PID --user=mysql \ + $MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PIDFILE --user=mysql \ > /dev/null 2>&1 & wait_for_ready [ $? = 0 ] && echo "OK" || echo "FAIL" @@ -49,8 +49,8 @@ start() { stop() { printf "Stopping mysql ... " - if [ -f $MYSQL_PID ]; then - kill `cat $MYSQL_PID` > /dev/null 2>&1 + if [ -f $MYSQL_PIDFILE ]; then + kill `cat $MYSQL_PIDFILE` > /dev/null 2>&1 [ $? = 0 ] && echo "OK" || echo "FAIL" else echo "FAIL" -- 2.30.2