diff options
| author | unknown <joerg@mysql.com> | 2005-11-23 09:38:12 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-11-23 09:38:12 +0100 |
| commit | ddf89750ea8c765429a1d29c5b5b1b783112ba98 (patch) | |
| tree | 38ca244ce3988c632f1946880a7066643e9cd2dd /support-files | |
| parent | 9f2a2b9a3b43c0ac0f69c09299202cbbecf8d949 (diff) | |
| parent | 6a6caf565d0b535dc352356556d37a95ec3216ca (diff) | |
| download | mariadb-git-ddf89750ea8c765429a1d29c5b5b1b783112ba98.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
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 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 <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 |