bat: Call parent constructor in all pages

[bacula/bacula] / bacula / scripts / bacula-ctl-sd.in

diff --git a/bacula/scripts/bacula-ctl-sd.in b/bacula/scripts/bacula-ctl-sd.in
index 9046f5b8fbe1b34f48d9bcb3508fa8113cc2bda4..1f8592106a8988ffec8597cea9804f20bc5d6922 100644 (file)
--- a/bacula/scripts/bacula-ctl-sd.in
+++ b/bacula/scripts/bacula-ctl-sd.in
@@ -6,7 +6,7 @@
 #   This is pretty much watered down version of the RedHat script
 #   that works on Solaris as well as Linux, but it won't work everywhere.
 #
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 
 PSCMD="@PSCMD@"
@@ -128,7 +128,8 @@ pidofproc() {
    fi
 
    # Finally try to extract it from ps
-   ${PSCMD} | grep $1 | ${AWK} '{ print $1 }' | tr '\n' ' '
+   pid=`${PSCMD} | grep $1 | ${AWK} '{ print $1 }' | tr '\n' ' '`
+   echo $pid
    return 0
 }
 
@@ -207,7 +208,11 @@ case "$1" in
            OPTIONS="${OPTIONS} -g ${SD_GROUP}"
         fi
 
-        ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+        if [ "x${VALGRIND_SD}" = "x1" ]; then
+           valgrind --leak-check=full ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+        else
+           ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+        fi
       }
       ;;