Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä 2021-03-31 12:04:50 +03:00
commit 176aaf93d1
40 changed files with 857 additions and 885 deletions

View file

@ -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