diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-22 01:55:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-02 11:03:32 +0200 |
| commit | 4975d2539043ed27599a7fe818c0c8c517740bf2 (patch) | |
| tree | c489d1162ac876f6fec401086ba348da2055d09c /support-files | |
| parent | 4a7d7e79a27f47fb761806caf8d8d6c17e37d6f9 (diff) | |
| download | mariadb-git-4975d2539043ed27599a7fe818c0c8c517740bf2.tar.gz | |
don't run SysV scripts in scriptlets if systemd is used
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/rpm/server-postin.sh | 4 | ||||
| -rw-r--r-- | support-files/rpm/server-posttrans.sh | 7 | ||||
| -rw-r--r-- | support-files/rpm/server-preun.sh | 18 |
3 files changed, 15 insertions, 14 deletions
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh index 08b046dc272..ad783812184 100644 --- a/support-files/rpm/server-postin.sh +++ b/support-files/rpm/server-postin.sh @@ -17,9 +17,7 @@ fi if [ $1 = 1 ] ; then if [ -x /usr/bin/systemctl ] ; then /usr/bin/systemctl daemon-reload >/dev/null 2>&1 - fi - - if [ -x /sbin/chkconfig ] ; then + elif [ -x /sbin/chkconfig ] ; then /sbin/chkconfig --add mysql fi diff --git a/support-files/rpm/server-posttrans.sh b/support-files/rpm/server-posttrans.sh index 0d242596185..0845a68c791 100644 --- a/support-files/rpm/server-posttrans.sh +++ b/support-files/rpm/server-posttrans.sh @@ -1,11 +1,10 @@ if [ -r %{restart_flag} ] ; then rm %{restart_flag} + # only restart the server if it was alredy running if [ -x /usr/bin/systemctl ] ; then /usr/bin/systemctl daemon-reload > /dev/null 2>&1 - fi - - # only restart the server if it was alredy running - if %{_sysconfdir}/init.d/mysql status > /dev/null 2>&1; then + /usr/bin/systemctl try-restart mariadb.service > /dev/null 2>&1 + elif %{_sysconfdir}/init.d/mysql status > /dev/null 2>&1; then %{_sysconfdir}/init.d/mysql restart fi fi diff --git a/support-files/rpm/server-preun.sh b/support-files/rpm/server-preun.sh index 7ef48f1c8d4..1d733a7d899 100644 --- a/support-files/rpm/server-preun.sh +++ b/support-files/rpm/server-preun.sh @@ -1,12 +1,16 @@ if [ $1 = 0 ] ; then - # Stop MySQL before uninstalling it - if [ -x %{_sysconfdir}/init.d/mysql ] ; then - %{_sysconfdir}/init.d/mysql stop > /dev/null - fi + # Stop MySQL before uninstalling it # Don't start it automatically anymore - if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig --del mysql - fi + if [ -x /usr/bin/systemctl ] ; then + /usr/bin/systemctl stop mariadb.service > /dev/null 2>&1 + /usr/bin/systemctl disable mariadb.service > /dev/null 2>&1 + fi + if [ -x %{_sysconfdir}/init.d/mysql ] ; then + %{_sysconfdir}/init.d/mysql stop > /dev/null + fi + if [ -x /sbin/chkconfig ] ; then + /sbin/chkconfig --del mysql > /dev/null 2>&1 + fi fi # We do not remove the mysql user since it may still own a lot of |