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 f288f7d2b6364461a1fc72fd09b4f8514d4eea88..9e7200832495b66085d38eecf610cd997de7fbf8 100755 (executable)
--- a/bacula/platforms/redhat/bacula-fd.in
+++ b/bacula/platforms/redhat/bacula-fd.in
@@ -14,7 +14,13 @@
 
 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)
        OPTIONS=''
@@ -25,14 +31,14 @@ case "$1" in
        if [ "${FD_GROUP}" != '' ]; then
          OPTIONS="${OPTIONS} -g ${FD_GROUP}"
        fi
-       echo -n "Starting the Bacula File daemon: "
+       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