diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-15 17:07:41 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-15 17:07:41 -0400 |
| commit | fd1b2e486a9a81ffb5416e7a0a0d85d15598c77c (patch) | |
| tree | 9f313fa7e2ad66ec504746d7eaa3055482ea0186 | |
| parent | 653aadcd59f4ac94750d9ebf398d6e44029ebe3f (diff) | |
| download | mariadb-git-fd1b2e486a9a81ffb5416e7a0a0d85d15598c77c.tar.gz | |
MDEV-8803: Debian jessie 8.2 + MariaDB 10.1.7 + GaleraCluster
* Merge fix for issue #127 from mysql-wsrep (commit : a0ba0d7)
* Also, cherry-picked a similar fix for OpenSUSE (commit : 7790cb1)
| -rw-r--r-- | debian/mariadb-galera-server-5.5.mysql.init | 3 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/mariadb-galera-server-5.5.mysql.init b/debian/mariadb-galera-server-5.5.mysql.init index d604075b9e4..874d099a0c6 100644 --- a/debian/mariadb-galera-server-5.5.mysql.init +++ b/debian/mariadb-galera-server-5.5.mysql.init @@ -17,6 +17,9 @@ set -e set -u ${DEBIAN_SCRIPT_DEBUG:+ set -v -x} +# Prevent Debian's init scripts from calling systemctl +_SYSTEMCTL_SKIP_REDIRECT=true + test -x /usr/sbin/mysqld || exit 0 . /lib/lsb/init-functions diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 30d1ecd5f4c..fb9e01ded43 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -24,6 +24,14 @@ # Short-Description: start and stop MySQL # Description: MySQL is a very fast and reliable SQL database engine. ### END INIT INFO + +# Prevent OpenSUSE's init scripts from calling systemd, so that +# both 'bootstrap' and 'start' are handled entirely within this +# script +SYSTEMD_NO_WRAP=1 + +# Prevent Debian's init scripts from calling systemctl +_SYSTEMCTL_SKIP_REDIRECT=true # If you install MySQL on some other places than @prefix@, then you # have to do one of the following things for this script to work: |