summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-09-24 17:32:50 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-09-24 17:32:50 +0300
commit83c4523f0378ec37986501104d55b0258e6ac9f2 (patch)
treecc750751e3c73e4b77b784c25d8ad3e8b43029fc /support-files
parent88f38661b75e68ed255491ed51e52e73cfe06011 (diff)
parent69bd2c88e17df2aa6c0edce5196e70976129dfab (diff)
downloadmariadb-git-83c4523f0378ec37986501104d55b0258e6ac9f2.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.server.sh15
1 files changed, 7 insertions, 8 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index cbd6b472148..d2c824697d1 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -91,16 +91,15 @@ datadir_set=
#
# Use LSB init script functions for printing messages, if possible
-#
+# Include non-LSB RedHat init functions to make systemctl redirect work
+init_functions="/etc/init.d/functions"
lsb_functions="/lib/lsb/init-functions"
-if test -f $lsb_functions ; then
+if test -f $lsb_functions; then
. $lsb_functions
-else
- # Include non-LSB RedHat init functions to make systemctl redirect work
- init_functions="/etc/init.d/functions"
- if test -f $init_functions; then
- . $init_functions
- fi
+fi
+
+if test -f $init_functions; then
+ . $init_functions
log_success_msg()
{
echo " SUCCESS! $@"