Quote device name in SD and implement releasing message

[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 aecbad6dbf0dbd8a117e61895aade85746e5030f..ba9445397cb0cfe66b2f647d96fcda8ccc7db1d5 100755 (executable)
--- a/bacula/platforms/redhat/bacula-fd.in
+++ b/bacula/platforms/redhat/bacula-fd.in
@@ -4,7 +4,7 @@
 #             the bacula File daemon.
 #
 # chkconfig: 2345 91 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #
@@ -14,25 +14,35 @@
 
 FD_USER=@fd_user@
 FD_GROUP=@fd_group@
+FD_OPTIONS=''
 OS=`uname -s`
 
 # if /lib/tls exists, force Bacula to use the glibc pthreads instead
 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 FD_OPTIONS, FD_USER, FD_GROUP 
+[ -f /etc/sysconfig/bacula ] && . /etc/sysconfig/bacula
+
+#
+# Disable Glibc malloc checks, it doesn't help and it keeps from getting
+#   good dumps
+MALLOC_CHECK_=0
+export MALLOC_CHECK_
+
 RETVAL=0
 case "$1" in
     start)
-       OPTIONS=''
        if [ "${FD_USER}" != '' ]; then
-         OPTIONS="${OPTIONS} -u ${FD_USER}"
+         FD_OPTIONS="${FD_OPTIONS} -u ${FD_USER}"
        fi
                                                                                   
        if [ "${FD_GROUP}" != '' ]; then
-         OPTIONS="${OPTIONS} -g ${FD_GROUP}"
+         FD_OPTIONS="${FD_OPTIONS} -g ${FD_GROUP}"
        fi
        echo -n "Starting Bacula File services: "
-       daemon @sbindir@/bacula-fd $2 ${OPTIONS} -c @sysconfdir@/bacula-fd.conf
+       daemon @sbindir@/bacula-fd $2 ${FD_OPTIONS} -c @sysconfdir@/bacula-fd.conf
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-fd
@@ -51,10 +61,11 @@ case "$1" in
        ;;
     status)
        status @sbindir@/bacula-fd
+       RETVAL=$?
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"
        exit 1
        ;;
 esac
-exit 0
+exit $RETVAL