You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

29 lines
791 B

  1. --- a/scripts/mysqld_safe.sh
  2. +++ b/scripts/mysqld_safe.sh
  3. @@ -242,7 +242,7 @@ wsrep_recover_position() {
  4. return 1
  5. fi
  6. - local wr_pidfile="$DATADIR/"`@HOSTNAME@`"-recover.pid"
  7. + local wr_pidfile="$DATADIR/"$(uci get 'system.@system[0].hostname')"-recover.pid"
  8. local wr_options="--disable-log-error --pid-file='$wr_pidfile'"
  9. @@ -673,7 +673,7 @@ then
  10. * ) err_log="$DATADIR/$err_log" ;;
  11. esac
  12. else
  13. - err_log=$DATADIR/`@HOSTNAME@`.err
  14. + err_log=$DATADIR/$(uci get 'system.@system[0].hostname').err
  15. fi
  16. fi
  17. @@ -752,7 +752,7 @@ fi
  18. if test -z "$pid_file"
  19. then
  20. - pid_file="`@HOSTNAME@`.pid"
  21. + pid_file="$(uci get 'system.@system[0].hostname').pid"
  22. fi
  23. # MariaDB wants pid file without datadir
  24. append_arg_to_args "--pid-file=$pid_file"