Merge branch 'master' into bat_slot

[bacula/bacula] / bacula / platforms / redhat / bacula-sd.in

diff --git a/bacula/platforms/redhat/bacula-sd.in b/bacula/platforms/redhat/bacula-sd.in
index 4ba08f22ff8011fc777b8f0f808ffdc8946ca531..bf434887a9fe2db7da5b392a707f1ca035865d62 100755 (executable)
--- a/bacula/platforms/redhat/bacula-sd.in
+++ b/bacula/platforms/redhat/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 90 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
@@ -14,26 +14,42 @@
 
 SD_USER=@sd_user@
 SD_GROUP=@sd_group@
+SD_OPTIONS=''
+OS=`uname -s`
 
+# if /lib/tls exists, force Bacula to use the glibc pthreads instead
+if [ -d "/lib/tls" -a $OS = "Linux" -a `uname -r | cut -c1-3` = "2.4" ] ; then
+     export LD_ASSUME_KERNEL=2.4.19
+fi
+
+# pull in any user defined SD_OPTIONS, SD_USER, or SD_GROUP
+[ -f /etc/sysconfig/bacula ] && . /etc/sysconfig/bacula
+
+#
+# Disable Glibc malloc checks, it doesn't help and it keeps from getting
+#   good dumps
+MALLOC_CHECK_=0
+export MALLOC_CHECK_
+
+RETVAL=0
 case "$1" in
     start)
-       OPTIONS=''
        if [ "${SD_USER}" != '' ]; then
-         OPTIONS="${OPTIONS} -u ${SD_USER}"
+         SD_OPTIONS="${SD_OPTIONS} -u ${SD_USER}"
        fi
                                                                                   
        if [ "${SD_GROUP}" != '' ]; then
-         OPTIONS="${OPTIONS} -g ${SD_GROUP}"
+         SD_OPTIONS="${SD_OPTIONS} -g ${SD_GROUP}"
        fi
                                                                                      
-       echo -n "Starting the Bacula Storage daemon: "
-       daemon @sbindir@/bacula-sd $2 ${OPTIONS} -c @sysconfdir@/bacula-sd.conf
+       echo -n "Starting Bacula Storage services: "
+       daemon @sbindir@/bacula-sd $2 ${SD_OPTIONS} -c @sysconfdir@/bacula-sd.conf
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-sd
        ;;
     stop)
-       echo -n "Stopping the Bacula Storage daemon: "
+       echo -n "Stopping Bacula Storage services: "
        killproc @sbindir@/bacula-sd
        RETVAL=$?
        echo