X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fplatforms%2Fredhat%2Fbacula-dir.in;h=8d2e1f2f8a5628f58d570cc8bb29b7025baf36e9;hb=81f231a9cf30d57e00eb7dbf6ba953e5ada84d3a;hp=84cca2904ab5b82226e3ae897d94dd0576527ce7;hpb=f9b1b9f866c77a9b86199b2b11e08d2ad1166093;p=bacula%2Fbacula

diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in
index 84cca2904a..8d2e1f2f8a 100755
--- a/bacula/platforms/redhat/bacula-dir.in
+++ b/bacula/platforms/redhat/bacula-dir.in
@@ -14,31 +14,35 @@
 
 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" ] ; 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 DIR_DIR_OPTIONS, DIR_USER, or DIR_GROUP
+[ -f /etc/sysconfig/bacula ] && . /etc/sysconfig/bacula
+
 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