database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Code Activity

MDEV-15526 SysV init service deployed file '/etc/init.d/mysql' prevents systemctl disable command to work correctly (mariadb|mysql naming support) (debian/ubuntu)

Browse Source 
mariadb service is controlled by systemd

Do not install SysV init script on Debian/Ubuntu in /etc/init.d/
put it in /usr/share/mysql in case the user would need it for something.

Use systemctl in pre/post scripts directly
without funky conditionals and wrapper scripts
This commit is contained in:
Sergei Golubchik
2019-06-14 16:10:45 +02:00
parent 0a43df4fbc
commit a4cc6fb91f
5 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
debian/mariadb-server-10.4.mysql.init → debian/additions/mysql.init vendored
View File

1
debian/mariadb-server-10.4.install vendored
View File

@@ -2,6 +2,7 @@ debian/additions/debian-start etc/mysql
debian/additions/debian-start.inc.sh usr/share/mysql debian/additions/debian-start.inc.sh usr/share/mysql
debian/additions/echo_stderr usr/share/mysql debian/additions/echo_stderr usr/share/mysql
debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
debian/additions/mysql.init usr/share/mysql
etc/apparmor.d/usr.sbin.mysqld etc/apparmor.d/usr.sbin.mysqld
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
usr/bin/aria_chk usr/bin/aria_chk

6
debian/mariadb-server-10.4.postinst vendored
View File

@@ -17,11 +17,7 @@ ERR_LOGGER="logger -p daemon.err -t mariadb-server-$VER.postinst -i"
set -o pipefail set -o pipefail
invoke() { invoke() {
if [ -x /usr/sbin/invoke-rc.d ]; then systemctl $1 mysql
invoke-rc.d mysql $1
else
/etc/init.d/mysql $1
fi
} }
case "$1" in case "$1" in

6
debian/mariadb-server-10.4.postrm vendored
View File

@@ -12,11 +12,7 @@ MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
# is running! # is running!
stop_server() { stop_server() {
set +e set +e
if [ -x /usr/sbin/invoke-rc.d ]; then systemctl stop mysql
invoke-rc.d mysql stop
else
/etc/init.d/mysql stop
fi
errno=$? errno=$?
set -e set -e

11
debian/mariadb-server-10.4.preinst vendored
View File

@@ -20,25 +20,18 @@ mysql_upgradedir=/var/lib/mysql-upgrade
# do it himself. No database directories should be removed while the server # do it himself. No database directories should be removed while the server
# is running! Another mysqld in e.g. a different chroot is fine for us. # is running! Another mysqld in e.g. a different chroot is fine for us.
stop_server() { stop_server() {
if [ ! -x /etc/init.d/mysql ]; then return; fi
# Return immediately if there are no mysql processes running # Return immediately if there are no mysql processes running
# as there is no point in trying to shutdown in that case. # as there is no point in trying to shutdown in that case.
if ! pgrep mysqld > /dev/null; then return; fi if ! pgrep mysqld > /dev/null; then return; fi
set +e set +e
if [ -x /usr/sbin/invoke-rc.d ]; then systemctl stop mysql
cmd="invoke-rc.d mysql stop"
else
cmd="/etc/init.d/mysql stop"
fi
$cmd
errno=$? errno=$?
set -e set -e
# 0=ok, 100=no init script (fresh install) # 0=ok, 100=no init script (fresh install)
if [ "$errno" != 0 -a "$errno" != 100 ]; then if [ "$errno" != 0 -a "$errno" != 100 ]; then
echo "${cmd/ */} returned $errno" 1>&2 echo "'systemctl stop mysql' returned $errno" 1>&2
echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2 echo "There is a MySQL server running, but we failed in our attempts to stop it." 1>&2
echo "Stop it yourself and try again!" 1>&2 echo "Stop it yourself and try again!" 1>&2
db_stop db_stop