committing changes in /etc after apt run
Package changes: -galera-4 26.4.13-bullseye amd64 +galera-4 26.4.14-deb11 amd64 -libmariadb3 1:10.8.6+maria~deb11 amd64 +libmariadb3 1:10.8.7+maria~deb11 amd64 -mariadb-client 1:10.8.6+maria~deb11 all -mariadb-client-10.8 1:10.8.6+maria~deb11 amd64 -mariadb-client-core-10.8 1:10.8.6+maria~deb11 amd64 -mariadb-common 1:10.8.6+maria~deb11 all -mariadb-server 1:10.8.6+maria~deb11 all -mariadb-server-10.8 1:10.8.6+maria~deb11 amd64 -mariadb-server-core-10.8 1:10.8.6+maria~deb11 amd64 +mariadb-client 1:10.8.7+maria~deb11 all +mariadb-client-10.8 1:10.8.7+maria~deb11 amd64 +mariadb-client-core-10.8 1:10.8.7+maria~deb11 amd64 +mariadb-common 1:10.8.7+maria~deb11 all +mariadb-server 1:10.8.7+maria~deb11 all +mariadb-server-10.8 1:10.8.7+maria~deb11 amd64 +mariadb-server-core-10.8 1:10.8.7+maria~deb11 amd64 -mysql-common 1:10.8.6+maria~deb11 all +mysql-common 1:10.8.7+maria~deb11 all
This commit is contained in:
+18
-3
@@ -21,9 +21,24 @@ test -x /usr/sbin/mariadbd || exit 0
|
||||
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
|
||||
SELF=$(cd "$(dirname $0)"; pwd -P)/$(basename $0)
|
||||
|
||||
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
|
||||
if [ -f /usr/bin/mariadb-admin ]
|
||||
then
|
||||
MYADMIN="/usr/bin/mariadb-admin --defaults-file=/etc/mysql/debian.cnf"
|
||||
elif [ -f /usr/bin/mysqladmin ]
|
||||
then
|
||||
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
|
||||
else
|
||||
log_failure_msg "Command mariadb-admin/mysqladmin not found! This SysV init script depends on it."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
if [ ! -x /usr/bin/mariadbd-safe ]
|
||||
then
|
||||
log_failure_msg "/usr/bin/mariadbd-safe not found or executable! This SysV init script depends on it."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
# priority can be overridden and "-s" adds output to stderr
|
||||
ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mariadb -i"
|
||||
@@ -118,7 +133,7 @@ case "${1:-''}" in
|
||||
test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld
|
||||
|
||||
# Start MariaDB!
|
||||
/usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
|
||||
/usr/bin/mariadbd-safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
|
||||
|
||||
for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do
|
||||
sleep 1
|
||||
|
||||
+6
-6
@@ -17,12 +17,12 @@ 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
|
||||
MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent"
|
||||
MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf"
|
||||
MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables"
|
||||
MARIADB="/usr/bin/mariadb --defaults-file=/etc/mysql/debian.cnf"
|
||||
MYADMIN="/usr/bin/mariadb-admin --defaults-file=/etc/mysql/debian.cnf"
|
||||
# Don't run full mariadb-upgrade on every server restart, use --version-check to do it only once
|
||||
MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent"
|
||||
MYCHECK="/usr/bin/mariadb-check --defaults-file=/etc/mysql/debian.cnf"
|
||||
MYCHECK_SUBJECT="WARNING: mariadb-check has found corrupt tables"
|
||||
MYCHECK_PARAMS="--all-databases --fast --silent"
|
||||
MYCHECK_RCPT="${MYCHECK_RCPT:-root}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user