X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fplatforms%2Fredhat%2Fbacula-dir.in;h=43e5111689fcabbbaef6e5e48d0bf31ba61c0940;hb=206c03fd59bf724b977cc2ee9aea0f5afffae4d2;hp=d568cdb9993601e05178347728debcded757e060;hpb=1ef84681d13d0c355d6ae78579d2afe1c8d8d0e2;p=bacula%2Fbacula

diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in
index d568cdb999..43e5111689 100755
--- 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 20 99
+# chkconfig: 2345 92 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
@@ -12,17 +12,43 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+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)
-       echo -n "Starting the Bacula Director: "
-       daemon @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
+       if [ "${DIR_USER}" != '' ]; then
+	  DIR_OPTIONS="${DIR_OPTIONS} -u ${DIR_USER}"
+       fi
+										   
+       if [ "${DIR_GROUP}" != '' ]; then
+	  DIR_OPTIONS="${DIR_OPTIONS} -g ${DIR_GROUP}"
+       fi
+       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