summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-10-01 10:50:32 +0400
committerAlexander Barkov <bar@mariadb.com>2019-10-01 11:44:27 +0400
commit1ae09ec8636be184d8a1017381a7d533f2bb29c9 (patch)
tree7723af89a724cb6337e480ac31621c33d0056584 /support-files
parent4cd79588deb1b49499ff1f49bcf7f17f00eb241a (diff)
parentdc588e3d3fc0d3610ffb6f4e9c804dc539394669 (diff)
downloadmariadb-git-1ae09ec8636be184d8a1017381a7d533f2bb29c9.tar.gz
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'support-files')
-rw-r--r--support-files/rpm/server-preun.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/rpm/server-preun.sh b/support-files/rpm/server-preun.sh
index f4eb81a7f75..34a35cbc5c5 100644
--- a/support-files/rpm/server-preun.sh
+++ b/support-files/rpm/server-preun.sh
@@ -8,7 +8,7 @@ if [ $1 = 0 ] ; then
if [ -x %{_sysconfdir}/init.d/mysql ] ; then
%{_sysconfdir}/init.d/mysql stop > /dev/null
if [ -x /sbin/chkconfig ] ; then
- /sbin/chkconfig --del mysql > /dev/null 2>&1
+ /sbin/chkconfig --del mysql > /dev/null 2>&1 || :
fi
fi
fi