diff options
| author | unknown <joerg@mysql.com> | 2005-11-22 20:15:54 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-11-22 20:15:54 +0100 |
| commit | 57e1c5aa9a56bbe75f3a0bc8344b3a1346438bbb (patch) | |
| tree | 13666a0e745326a643f2a023c9dc8db1fb25c0db /support-files | |
| parent | 0026b6f46e550ff8f8c874f55272d15f4a19f3ac (diff) | |
| parent | 6a6caf565d0b535dc352356556d37a95ec3216ca (diff) | |
| download | mariadb-git-57e1c5aa9a56bbe75f3a0bc8344b3a1346438bbb.tar.gz | |
Manual merge from 4.1, bug#15145.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 991afd367c0..4c52b4cee6b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -508,22 +508,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 @@ -707,6 +707,11 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com> + +- 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 <lenz@grimmer.com> - added more man pages |