Deb: Add support for legacy init systems again

Partially reverts commit a4cc6fb91f3855e0ed803a6e1762440cfcf8cb5c.

While all current versions of Linux have systemd, support for traditional
init.d is still needed e.g. on Linux subsystem on Windows, kFreeBSD and
special variants of Debian/Ubuntu that for other reasons don't have
systemd.

Thus, re-introduce the init file that was remove, but this time with
then name 'mariadb'.

Supporting traditional sysv init in paraller with systemd is easy, since
Debian has facilities for it.

Also simplify and update salsa-ci.yml install/upgrade testing works
for all previous MariaDB and MySQL releases without any excess quirks.

Note that in fresh installs the salsa-ci.yml needs to run command
'service mariadb status' to control the service, while on upgrades
it is enough to run 'service mysql status', since the init.d/mysql
file is left behind from previous install, along with some other
config files such as /etc/default/mysql and /etc/mysql/* stuff.

2 files changed, 6 insertions, 194 deletions

diff --git a/debian/additions/debian-start b/debian/additions/debian-start
index 7de59ce1fe9..e00684d6c54 100755
--- a/debian/additions/debian-start
+++ b/debian/additions/debian-start
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# This script is executed by "/etc/init.d/mysql" on every (re)start.
+# This script is executed by "/etc/init.d/mariadb" on every (re)start.
 #
 # Changes to this file will be preserved when updating the Debian package.
 #
@@ -9,10 +9,15 @@
 
 source /usr/share/mysql/debian-start.inc.sh
 
+# Read default/mysql first and then default/mariadb just like the init.d file does
 if [ -f /etc/default/mysql ]; then
   . /etc/default/mysql
 fi
 
+if [ -f /etc/default/mariadb ]; then
+  . /etc/default/mariadb
+fi
+
 MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf"
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 # Don't run full mysql_upgrade on every server restart, use --version-check to do it only once
diff --git a/debian/additions/mysql.init b/debian/additions/mysql.init
deleted file mode 100755
index 0d4c6019ab5..00000000000
--- a/debian/additions/mysql.init
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/bash
-#
-### BEGIN INIT INFO
-# Provides:          mysql
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Should-Start:      $network $named $time
-# Should-Stop:       $network $named $time
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start and stop the mysql database server daemon
-# Description:       Controls the main MariaDB database server daemon "mysqld"
-#                    and its wrapper script "mysqld_safe".
-### END INIT INFO
-#
-set -e
-set -u
-${DEBIAN_SCRIPT_DEBUG:+ set -v -x}
-
-test -x /usr/sbin/mysqld || exit 0
-
-. /lib/lsb/init-functions
-
-SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
-
-MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-
-# priority can be overridden and "-s" adds output to stderr
-ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
-
-if [ -f /etc/default/mysql ]; then
-  . /etc/default/mysql
-fi
-
-# Safeguard (relative paths, core dumps..)
-cd /
-umask 077
-
-# mysqladmin likes to read /root/.my.cnf. This is usually not what I want
-# as many admins e.g. only store a password without a username there and
-# so break my scripts.
-export HOME=/etc/mysql/
-
-## Fetch a particular option from mysql's invocation.
-#
-# Usage: void mysqld_get_param option
-mysqld_get_param() {
-  /usr/sbin/mysqld --print-defaults \
-    | tr " " "\n" \
-    | grep -- "--$1" \
-    | tail -n 1 \
-    | cut -d= -f2
-}
-
-## Do some sanity checks before even trying to start mysqld.
-sanity_checks() {
-  # check for config file
-  if [ ! -r /etc/mysql/my.cnf ]; then
-    log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz"
-    echo                "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER
-  fi
-
-  # check for diskspace shortage
-  datadir=`mysqld_get_param datadir`
-  if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then
-    log_failure_msg "$0: ERROR: The partition with $datadir is too full!"
-    echo                "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER
-    exit 1
-  fi
-}
-
-## Checks if there is a server running and if so if it is accessible.
-#
-# check_alive insists on a pingable server
-# check_dead also fails if there is a lost mysqld in the process list
-#
-# Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn]
-mysqld_status () {
-  ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? ))
-
-  ps_alive=0
-  pidfile=`mysqld_get_param pid-file`
-  if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
-
-  if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
-     [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
-    return 0 # EXIT_SUCCESS
-  else
-    if [ "$2" = "warn" ]; then
-      echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug
-    fi
-  return 1 # EXIT_FAILURE
-  fi
-}
-
-#
-# main()
-#
-
-case "${1:-''}" in
-
-  'start')
-  sanity_checks;
-  # Start daemon
-  log_daemon_msg "Starting MariaDB database server" "mysqld"
-  if mysqld_status check_alive nowarn; then
-   log_progress_msg "already running"
-   log_end_msg 0
-  else
-    # Could be removed during boot
-    test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
-
-    # Start MariaDB!
-    /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
-
-    for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do
-      sleep 1
-      if mysqld_status check_alive nowarn ; then break; fi
-      log_progress_msg "."
-    done
-    if mysqld_status check_alive warn; then
-      log_end_msg 0
-      # Now start mysqlcheck or whatever the admin wants.
-      output=$(/etc/mysql/debian-start)
-      if [ -n "$output" ]; then
-        log_action_msg "$output"
-      fi
-    else
-      log_end_msg 1
-      log_failure_msg "Please take a look at the syslog"
-    fi
-  fi
-  ;;
-
-  'stop')
-  # * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible
-  # at least for cron, we can rely on it here, too. (although we have
-  # to specify it explicit as e.g. sudo environments points to the normal
-  # users home and not /root)
-  log_daemon_msg "Stopping MariaDB database server" "mysqld"
-  if ! mysqld_status check_dead nowarn; then
-    set +e
-    shutdown_out=`$MYADMIN shutdown 2>&1`; r=$?
-    set -e
-    if [ "$r" -ne 0 ]; then
-      log_end_msg 1
-      [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out"
-      log_daemon_msg "Killing MariaDB database server by signal" "mysqld"
-      killall -15 mysqld
-      server_down=
-      for i in `seq 1 600`; do
-        sleep 1
-        if mysqld_status check_dead nowarn; then server_down=1; break; fi
-      done
-      if test -z "$server_down"; then killall -9 mysqld; fi
-    fi
-  fi
-
-  if ! mysqld_status check_dead warn; then
-    log_end_msg 1
-    log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.5/README.Debian.gz!"
-    exit -1
-  else
-    log_end_msg 0
-  fi
-  ;;
-
-  'restart')
-  set +e; $SELF stop; set -e
-  shift
-  $SELF start "${@}"
-  ;;
-
-  'reload'|'force-reload')
-  log_daemon_msg "Reloading MariaDB database server" "mysqld"
-  $MYADMIN reload
-  log_end_msg 0
-  ;;
-
-  'status')
-  if mysqld_status check_alive nowarn; then
-    log_action_msg "$($MYADMIN version)"
-  else
-    log_action_msg "MariaDB is stopped."
-    exit 3
-  fi
-  ;;
-
-  *)
-  echo "Usage: $SELF start|stop|restart|reload|force-reload|status"
-  exit 1
-  ;;
-esac