Merge branch 'master' into bat_slot

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

diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in
index 4b5dc8eee2ad6df650f46086038a7b27329f642c..43e5111689fcabbbaef6e5e48d0bf31ba61c0940 100755 (executable)
--- a/bacula/platforms/redhat/bacula-dir.in
+++ b/bacula/platforms/redhat/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 92 99
+# chkconfig: 2345 92 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
@@ -14,26 +14,41 @@
 
 DIR_USER=@dir_user@
 DIR_GROUP=@dir_group@
+DIR_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 DIR_DIR_OPTIONS, DIR_USER, or DIR_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 [ "${DIR_USER}" != '' ]; then
-         OPTIONS="${OPTIONS} -u ${DIR_USER}"
+         DIR_OPTIONS="${DIR_OPTIONS} -u ${DIR_USER}"
        fi
                                                                                   
        if [ "${DIR_GROUP}" != '' ]; then
-         OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
+         DIR_OPTIONS="${DIR_OPTIONS} -g ${DIR_GROUP}"
        fi
-       echo -n "Starting the Bacula Director: "
-       daemon @sbindir@/bacula-dir $2 ${OPTIONS} -c @sysconfdir@/bacula-dir.conf
+       echo -n "Starting Bacula Director services: "
+       daemon @sbindir@/bacula-dir $2 ${DIR_OPTIONS} -c @sysconfdir@/bacula-dir.conf
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-dir
        ;;
     stop)
-       echo -n "Stopping the Director daemon: "
+       echo -n "Stopping Bacula Director services: "
        killproc @sbindir@/bacula-dir
        RETVAL=$?
        echo