database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-12 12:25:37 +03:00
Code Activity

don't run SysV scripts in scriptlets if systemd is used

Browse Source
This commit is contained in:
Sergei Golubchik
2019-03-22 01:55:35 +01:00
parent 4a7d7e79a2
commit 4975d25390
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
support-files/rpm/server-postin.sh
View File

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

7
support-files/rpm/server-posttrans.sh
View File

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

18
support-files/rpm/server-preun.sh
View File

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