From c735d07decfb5768b073b6bc6a5711bbf40a2084 Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Tue, 22 Nov 2005 19:58:58 +0100 Subject: [PATCH] support-files/mysql.spec.sh Fix a possible problem on RPM un-install. bug#15145 --- support-files/mysql.spec.sh | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 7a1219736ae..3d9c2d544ee 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -487,22 +487,22 @@ echo "Restarting mysqld." %preun server if test $1 = 0 then - # Stop MySQL before uninstalling it + # Stop MySQL before uninstalling it if test -x %{_sysconfdir}/init.d/mysql then %{_sysconfdir}/init.d/mysql stop > /dev/null - fi - # Remove autostart of mysql - # for older SuSE Linux versions - if test -x /sbin/insserv - then - /sbin/insserv -r %{_sysconfdir}/init.d/mysql - # use chkconfig on Red Hat and newer SuSE releases - elif test -x /sbin/chkconfig - then - /sbin/chkconfig --del mysql - fi + # Remove autostart of mysql + # for older SuSE Linux versions + if test -x /sbin/insserv + then + /sbin/insserv -r %{_sysconfdir}/init.d/mysql + # use chkconfig on Red Hat and newer SuSE releases + elif test -x /sbin/chkconfig + then + /sbin/chkconfig --del mysql + fi + fi fi # We do not remove the mysql user since it may still own a lot of @@ -689,6 +689,11 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Tue Nov 22 2005 Joerg Bruehe + +- Extend the file existence check for "init.d/mysql" on un-install + to also guard the call to "insserv"/"chkconfig". + * Thu Oct 27 2005 Lenz Grimmer - added more man pages