diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-30 21:33:01 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-30 21:33:01 +0100 |
commit | 36f67a7dff9087236e3c8b99452702b638fd020e (patch) | |
tree | 70835feb15dd56efaab13257ecf721f77c9295a5 /support-files | |
parent | cd1c10859d77d967aec8590fa9de4d17ed480dbf (diff) | |
parent | c8ba98206f1b08bf02c6a6f993b8e1b6842cb665 (diff) | |
download | mariadb-git-36f67a7dff9087236e3c8b99452702b638fd020e.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'support-files')
-rw-r--r-- | support-files/rpm/server-postin.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh index deb27c98ac1..71518423687 100644 --- a/support-files/rpm/server-postin.sh +++ b/support-files/rpm/server-postin.sh @@ -16,7 +16,8 @@ fi # Make MySQL start/shutdown automatically when the machine does it. if [ $1 = 1 ] ; then if [ -x /usr/bin/systemctl ] ; then - /usr/bin/systemctl daemon-reload >/dev/null 2>&1 + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + /usr/bin/systemctl preset mariadb.service >/dev/null 2>&1 || : elif [ -x /sbin/chkconfig ] ; then /sbin/chkconfig --add mysql fi |