[Commits] 33f0cf7: MDEV-9227 : Both CentOS service names mysql and mariadb exist?

Nirbhay Choubey nirbhay at mariadb.com
Wed Dec 9 19:24:53 EET 2015


revision-id: 33f0cf71196d3d2869ccfcbf1c41a0a6709fe8df
parent(s): 218da97d5d8e42de68d38aee25d5367569a35c4c
committer: Nirbhay Choubey
branch nick: 10.1.b9227
timestamp: 2015-12-09 12:24:53 -0500
message:

MDEV-9227 : Both CentOS service names mysql and mariadb exist?

As 10.1 has systemd support, there is no longer need to set
_SYSTEMCTL_SKIP_REDIRECT/SYSTEMD_NO_WRAP.

---
 debian/mariadb-server-10.1.mysql.init | 3 ---
 support-files/mysql.server.sh         | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/debian/mariadb-server-10.1.mysql.init b/debian/mariadb-server-10.1.mysql.init
index ca1848a..9e098b4 100644
--- a/debian/mariadb-server-10.1.mysql.init
+++ b/debian/mariadb-server-10.1.mysql.init
@@ -17,9 +17,6 @@ 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 24c200a..aa02b7e 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -25,14 +25,6 @@
 # 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:
 #


More information about the commits mailing list