diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 09:47:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-31 09:47:14 +0300 |
| commit | 50de71b026ddb560db2be14a06897874a5732dac (patch) | |
| tree | 576632c133864dca617a3e9f9855937c1ecae897 /support-files | |
| parent | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (diff) | |
| parent | d6d3d9ae2ffb1df8eebfe0c922394bbc7b12e4ed (diff) | |
| download | mariadb-git-50de71b026ddb560db2be14a06897874a5732dac.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/rpm/server-posttrans.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/support-files/rpm/server-posttrans.sh b/support-files/rpm/server-posttrans.sh index 0845a68c791..313274c6140 100644 --- a/support-files/rpm/server-posttrans.sh +++ b/support-files/rpm/server-posttrans.sh @@ -1,10 +1,15 @@ if [ -r %{restart_flag} ] ; then rm %{restart_flag} - # only restart the server if it was alredy running + # only restart the server if it was already running if [ -x /usr/bin/systemctl ] ; then /usr/bin/systemctl daemon-reload > /dev/null 2>&1 - /usr/bin/systemctl try-restart mariadb.service > /dev/null 2>&1 + if [ /usr/bin/systemctl is-active mysql ]; then + /usr/bin/systemctl restart mysql > /dev/null 2>&1 + else + /usr/bin/systemctl try-restart mariadb.service > /dev/null 2>&1 + fi + # not a systemd-enabled environment, use SysV startup script elif %{_sysconfdir}/init.d/mysql status > /dev/null 2>&1; then - %{_sysconfdir}/init.d/mysql restart + %{_sysconfdir}/init.d/mysql restart > /dev/null 2>&1 fi fi |