From 7a75f7f11841f7bba9885babab8d741e273e0e28 Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sat, 13 Mar 2004 11:58:25 +0000 Subject: [PATCH] Correct mysql Requires: for suse in spec file, add process status check to suse init scripts. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1134 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/platforms/redhat/bacula.spec.in | 8 +++++++- bacula/platforms/suse/bacula-dir.in | 7 +++++++ bacula/platforms/suse/bacula-fd.in | 7 +++++++ bacula/platforms/suse/bacula-sd.in | 7 +++++++ bacula/platforms/suse/bacula.spec.in | 8 +++++++- 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 62c7df0da7..1aa03c0088 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -160,10 +160,14 @@ Requires: GConf2 Requires: linc Requires: libtermcap %endif -%if %{mysql} +%if %{mysql} && ! %{su9} Requires: mysql >= 3.23 Requires: mysql-server >= 3.23 %endif +%if %{mysql} && %{su9} +Requires: mysql >= 3.23 +Requires: mysql-client >= 3.23 +%endif %if %{postgresql} && %{wb3} Requires: rh-postgresql >= 7 Requires: rh-postgresql-server >= 7 @@ -885,6 +889,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %changelog +* Sat Mar 13 2004 D. Scott Barninger +- corrected mysql prerequisites for suse * Mon Mar 1 2004 D. Scott Barninger - replaced all cp commands with cp -p - removed addition of a+x permissions on gnome-console diff --git a/bacula/platforms/suse/bacula-dir.in b/bacula/platforms/suse/bacula-dir.in index b70fac6e69..d34e668c48 100755 --- a/bacula/platforms/suse/bacula-dir.in +++ b/bacula/platforms/suse/bacula-dir.in @@ -8,8 +8,12 @@ # # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ # Modified to work on SuSE 1/31/2004 D. Scott Barninger +# Added rc.status functions 3/13/2004 D. Scott Barninger # +# source process status functions +# this gives us funtion rc_status -v to tell us if we succeed or fail +. /etc/rc.status RETVAL=0 case "$1" in @@ -17,6 +21,7 @@ case "$1" in echo -n "Starting the Bacula Director: " /sbin/startproc @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf RETVAL=$? + rc_status -v echo [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-dir ;; @@ -24,6 +29,7 @@ case "$1" in echo -n "Stopping the Director daemon: " /sbin/killproc @sbindir@/bacula-dir RETVAL=$? + rc_status -v echo [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-dir ;; @@ -34,6 +40,7 @@ case "$1" in ;; status) /sbin/checkproc @sbindir@/bacula-dir + rc_status -v ;; *) echo "Usage: $0 {start|stop|restart|status}" diff --git a/bacula/platforms/suse/bacula-fd.in b/bacula/platforms/suse/bacula-fd.in index 5245ecc0d3..0f2c427903 100755 --- a/bacula/platforms/suse/bacula-fd.in +++ b/bacula/platforms/suse/bacula-fd.in @@ -8,14 +8,19 @@ # # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ # Modified to work on SuSE 1/31/2004 D. Scott Barninger +# Added rc.status functions 3/13/2004 D. Scott Barninger # +# source process status functions +# this gives us funtion rc_status -v to tell us if we succeed or fail +. /etc/rc.status case "$1" in start) echo -n "Starting the Bacula File daemon: " /sbin/startproc @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf RETVAL=$? + rc_status -v echo [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-fd ;; @@ -23,6 +28,7 @@ case "$1" in echo -n "Stopping the Bacula File daemon: " /sbin/killproc @sbindir@/bacula-fd RETVAL=$? + rc_status -v echo [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-fd ;; @@ -33,6 +39,7 @@ case "$1" in ;; status) /sbin/checkproc @sbindir@/bacula-fd + rc_status -v ;; *) echo "Usage: $0 {start|stop|restart|status}" diff --git a/bacula/platforms/suse/bacula-sd.in b/bacula/platforms/suse/bacula-sd.in index ad926d96c0..3924137cc7 100755 --- a/bacula/platforms/suse/bacula-sd.in +++ b/bacula/platforms/suse/bacula-sd.in @@ -8,14 +8,19 @@ # # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ # Modified to work on SuSE 1/31/2004 D. Scott Barninger +# Added rc.status functions 3/13/2004 D. Scott Barninger # +# source process status functions +# this gives us funtion rc_status -v to tell us if we succeed or fail +. /etc/rc.status case "$1" in start) echo -n "Starting the Bacula Storage daemon: " /sbin/startproc @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf RETVAL=$? + rc_status -v echo [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-sd ;; @@ -23,6 +28,7 @@ case "$1" in echo -n "Stopping the Bacula Storage daemon: " /sbin/killproc @sbindir@/bacula-sd RETVAL=$? + rc_status -v echo [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-sd ;; @@ -33,6 +39,7 @@ case "$1" in ;; status) /sbin/checkproc @sbindir@/bacula-sd + rc_status -v ;; *) echo "Usage: $0 {start|stop|restart|status}" diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index 62c7df0da7..1aa03c0088 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -160,10 +160,14 @@ Requires: GConf2 Requires: linc Requires: libtermcap %endif -%if %{mysql} +%if %{mysql} && ! %{su9} Requires: mysql >= 3.23 Requires: mysql-server >= 3.23 %endif +%if %{mysql} && %{su9} +Requires: mysql >= 3.23 +Requires: mysql-client >= 3.23 +%endif %if %{postgresql} && %{wb3} Requires: rh-postgresql >= 7 Requires: rh-postgresql-server >= 7 @@ -885,6 +889,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %changelog +* Sat Mar 13 2004 D. Scott Barninger +- corrected mysql prerequisites for suse * Mon Mar 1 2004 D. Scott Barninger - replaced all cp commands with cp -p - removed addition of a+x permissions on gnome-console -- 2.39.5