diff options
| author | unknown <joerg@mysql.com> | 2005-11-22 20:30:45 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-11-22 20:30:45 +0100 |
| commit | 3380fd1d77c36ae3fe7114c935c2601646856ed5 (patch) | |
| tree | 09f8c3a9760c4535cdf1f5656ae0c0b9e152547f /support-files | |
| parent | 63cae6769a98bf3348d005d8cddb8347b324b6e3 (diff) | |
| parent | 6a6caf565d0b535dc352356556d37a95ec3216ca (diff) | |
| download | mariadb-git-3380fd1d77c36ae3fe7114c935c2601646856ed5.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 e5ff026a851..d93cb1f2176 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 @@ -706,6 +706,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 |