diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2020-06-19 13:40:50 +0300 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-07-30 10:36:39 +1000 |
| commit | 7c1807a0ad1e7461b34a1d50165883a7392ca81f (patch) | |
| tree | 050767b676c6feee5fe7873e50db1def08c79b09 | |
| parent | b8031e362af4d86ea4260c233ccb56dd18112691 (diff) | |
| download | mariadb-git-7c1807a0ad1e7461b34a1d50165883a7392ca81f.tar.gz | |
Deb: On upgrades, stop both mysqld and mariadbd for backwards compat
| -rw-r--r-- | debian/mariadb-server-10.5.postrm | 3 | ||||
| -rw-r--r-- | debian/mariadb-server-10.5.preinst | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/mariadb-server-10.5.postrm b/debian/mariadb-server-10.5.postrm index 00ff90dbb20..97789a038df 100644 --- a/debian/mariadb-server-10.5.postrm +++ b/debian/mariadb-server-10.5.postrm @@ -18,9 +18,12 @@ stop_server() { # Return immediately if there are no mysql processes running # as there is no point in trying to shutdown in that case. if ! pgrep -x mariadbd > /dev/null; then return; fi + # Compatibility with versions that ran 'mysqld' + if ! pgrep -x mysqld > /dev/null; then return; fi set +e invoke-rc.d mariadb stop + invoke-rc.d mysql stop # Backwards compatibility errno=$? set -e diff --git a/debian/mariadb-server-10.5.preinst b/debian/mariadb-server-10.5.preinst index ce4ca3fee9d..919031066c9 100644 --- a/debian/mariadb-server-10.5.preinst +++ b/debian/mariadb-server-10.5.preinst @@ -31,9 +31,12 @@ stop_server() { # Return immediately if there are no mysql processes running # as there is no point in trying to shutdown in that case. if ! pgrep -x --ns $$ mariadbd > /dev/null; then return; fi + # Compatibility with versions that ran 'mysqld' + if ! pgrep -x --ns $$ mysqld > /dev/null; then return; fi set +e invoke-rc.d mariadb stop + invoke-rc.d mysql stop # Backwards compatibility errno=$? set -e |