diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:13 +0000 |
| commit | 85c88fe6f1d622d10f5ac2d747412cb90f5cf150 (patch) | |
| tree | 310fa21dd40d6c7ad918d0771b5f03c378d54cc6 /debian/mariadb-server.mariadb.init | |
| parent | Merging upstream version 1:11.4.2. (diff) | |
| download | mariadb-progress-linux.tar.xz mariadb-progress-linux.zip | |
Merging debian version 1:11.4.2-1.HEADprogress-linux
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
debian/control
debian/libmariadbd19.install
debian/libmariadbd19.lintian-overrides
debian/salsa-ci.yml
Diffstat (limited to 'debian/mariadb-server.mariadb.init')
| -rw-r--r-- | debian/mariadb-server.mariadb.init | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/mariadb-server.mariadb.init b/debian/mariadb-server.mariadb.init index 6f44c7c4..aeffe89b 100644 --- a/debian/mariadb-server.mariadb.init +++ b/debian/mariadb-server.mariadb.init @@ -206,7 +206,7 @@ case "${1:-''}" in else ERROR_LOG_FILE="$(mktemp).err" echo # ensure newline - timeout --kill-after=20 10 /usr/bin/mysqld_safe "${@:2}" --log-error="$ERROR_LOG_FILE" + timeout --kill-after=20 10 /usr/bin/mariadbd-safe "${@:2}" --log-error="$ERROR_LOG_FILE" echo "Running '/etc/init.d/mariadb start' failed with error log:" cat "$ERROR_LOG_FILE" fi @@ -234,7 +234,7 @@ case "${1:-''}" in log_end_msg 1 [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out" log_daemon_msg "Killing MariaDB database server by signal" "mariadbd" - killall -15 mariadbd + killall -15 mariadbd || killall -15 mysqld server_down= for _ in {1..600} do @@ -247,7 +247,7 @@ case "${1:-''}" in done if test -z "$server_down" then - killall -9 mariadbd + killall -9 mariadbd || killall -15 mysqld fi fi fi |