X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fplatforms%2Fredhat%2Fbacula-fd.in;h=3f1b55c1c6df45ca124b862d9f139bd09b44c502;hb=f5bfdc29a0f4d4d40595cf4297a50ca08b3f1680;hp=dc7bf27177f032a5a9ff8bd4c40b34b930a24ff1;hpb=f9b1b9f866c77a9b86199b2b11e08d2ad1166093;p=bacula%2Fbacula

diff --git a/bacula/platforms/redhat/bacula-fd.in b/bacula/platforms/redhat/bacula-fd.in
index dc7bf27177..3f1b55c1c6 100755
--- a/bacula/platforms/redhat/bacula-fd.in
+++ b/bacula/platforms/redhat/bacula-fd.in
@@ -14,31 +14,41 @@
 
 FD_USER=@fd_user@
 FD_GROUP=@fd_group@
+FD_OPTIONS=''
 OS=`uname -s`
 
 # if /lib/tls exists, force Bacula to use the glibc pthreads instead
-if [ -d "/lib/tls" -a $OS = "Linux" ] ; then
+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 FD_OPTIONS, FD_USER, FD_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 [ "${FD_USER}" != '' ]; then
-	  OPTIONS="${OPTIONS} -u ${FD_USER}"
+	  FD_OPTIONS="${FD_OPTIONS} -u ${FD_USER}"
        fi
 										   
        if [ "${FD_GROUP}" != '' ]; then
-	  OPTIONS="${OPTIONS} -g ${FD_GROUP}"
+	  FD_OPTIONS="${FD_OPTIONS} -g ${FD_GROUP}"
        fi
-       echo -n "Starting the Bacula File daemon: "
-       daemon @sbindir@/bacula-fd $2 ${OPTIONS} -c @sysconfdir@/bacula-fd.conf
+       echo -n "Starting Bacula File services: "
+       daemon @sbindir@/bacula-fd $2 ${FD_OPTIONS} -c @sysconfdir@/bacula-fd.conf
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-fd
        ;;
     stop)
-       echo -n "Stopping the Bacula File daemon: "
+       echo -n "Stopping Bacula File services: "
        killproc @sbindir@/bacula-fd
        RETVAL=$?
        echo