diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-10 11:53:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-10 14:01:23 +0200 |
| commit | 3bc98a4ec4e7e7493ee93048dddfad87ceb3d8ff (patch) | |
| tree | ad189995a78fdc6068059e65b8455d3d4e61e719 /debian/mariadb-server-10.6.postrm | |
| parent | f4d671bff2c4dcfe1bb2af6d40122576e4fcfa91 (diff) | |
| parent | fe3d07cab82b2215dc64f52ac93122072c33d021 (diff) | |
| download | mariadb-git-3bc98a4ec4e7e7493ee93048dddfad87ceb3d8ff.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'debian/mariadb-server-10.6.postrm')
| -rw-r--r-- | debian/mariadb-server-10.6.postrm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/debian/mariadb-server-10.6.postrm b/debian/mariadb-server-10.6.postrm index 97789a038df..94ce91db31d 100644 --- a/debian/mariadb-server-10.6.postrm +++ b/debian/mariadb-server-10.6.postrm @@ -15,11 +15,9 @@ MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" # do it himself. No database directories should be removed while the server # is running! Another mariadbd in e.g. a different chroot is fine for us. stop_server() { - # Return immediately if there are no mysql processes running + # Return immediately if there are no mysqld 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 + if ! pgrep -x --nslist pid --ns $$ "mysqld|mariadbd" > /dev/null; then return; fi set +e invoke-rc.d mariadb stop |