Fix tray-monitor.conf for noreplace

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

diff --git a/bacula/platforms/redhat/bacula-fd.in b/bacula/platforms/redhat/bacula-fd.in
index 7d3e7c0980286b7c178920207362660dec826473..9e7200832495b66085d38eecf610cd997de7fbf8 100755 (executable)
--- a/bacula/platforms/redhat/bacula-fd.in
+++ b/bacula/platforms/redhat/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 91 99
+# chkconfig: 2345 91 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
@@ -12,16 +12,33 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+FD_USER=@fd_user@
+FD_GROUP=@fd_group@
+OS=`uname -s`
+
+# if /lib/tls exists, force Bacula to use the glibc pthreads instead
+if [ -d "/lib/tls" -a $OS = "Linux" ] ; then
+     export LD_ASSUME_KERNEL=2.4.19
+fi
+RETVAL=0
 case "$1" in
     start)
-       echo -n "Starting the Bacula File daemon: "
-       daemon @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf
+       OPTIONS=''
+       if [ "${FD_USER}" != '' ]; then
+         OPTIONS="${OPTIONS} -u ${FD_USER}"
+       fi
+                                                                                  
+       if [ "${FD_GROUP}" != '' ]; then
+         OPTIONS="${OPTIONS} -g ${FD_GROUP}"
+       fi
+       echo -n "Starting Bacula File services: "
+       daemon @sbindir@/bacula-fd $2 ${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