Fix tray-monitor.conf for noreplace

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

diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in
index 86131c92f58733c96816c444bf7b36707e76d2f8..ec9992f77366fa9c98316b743fe01c401dc699ec 100755 (executable)
--- a/bacula/platforms/redhat/bacula-dir.in
+++ b/bacula/platforms/redhat/bacula-dir.in
@@ -14,7 +14,12 @@
 
 DIR_USER=@dir_user@
 DIR_GROUP=@dir_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)
@@ -26,14 +31,14 @@ case "$1" in
        if [ "${DIR_GROUP}" != '' ]; then
          OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
        fi
-       echo -n "Starting the Bacula Director: "
+       echo -n "Starting Bacula Director services: "
        daemon @sbindir@/bacula-dir $2 ${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