X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fplatforms%2Fredhat%2Fbacula-sd.in;h=25edb43e2a2bcc9fe98ce8f19c8927a14b56077c;hb=2e7c372c90c4faf172890a7e557ed016b86c711b;hp=cf8d1af373f6987193d5f129f7e3b46744a0766f;hpb=f9b1b9f866c77a9b86199b2b11e08d2ad1166093;p=bacula%2Fbacula

diff --git a/bacula/platforms/redhat/bacula-sd.in b/bacula/platforms/redhat/bacula-sd.in
index cf8d1af373..25edb43e2a 100755
--- a/bacula/platforms/redhat/bacula-sd.in
+++ b/bacula/platforms/redhat/bacula-sd.in
@@ -14,32 +14,36 @@
 
 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" ] ; 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 SD_OPTIONS, SD_USER, or SD_GROUP
+[ -f /etc/sysconfig/bacula ] && . /etc/sysconfig/bacula
+
 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