--- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -253,7 +253,7 @@ wsrep_recover_position() { return 1 fi - local wr_pidfile="$DATADIR/"`@HOSTNAME@`"-recover.pid" + local wr_pidfile="$DATADIR/"$(uci get 'system.@system[0].hostname')"-recover.pid" local wr_options="--disable-log-error --pid-file='$wr_pidfile'" @@ -675,7 +675,7 @@ then * ) err_log="$DATADIR/$err_log" ;; esac else - err_log=$DATADIR/`@HOSTNAME@`.err + err_log=$DATADIR/$(uci get 'system.@system[0].hostname').err fi fi @@ -761,7 +761,7 @@ fi if test -z "$pid_file" then - pid_file="`@HOSTNAME@`.pid" + pid_file="$(uci get 'system.@system[0].hostname').pid" fi # MariaDB wants pid file without datadir append_arg_to_args "--pid-file=$pid_file"