Tweak bacula-ctl scripts for valgrind

diff --git a/bacula/scripts/bacula-ctl-dir.in b/bacula/scripts/bacula-ctl-dir.in
index 65cb8883e9406d1bdeaf17c96e37b044aca57fcf..0389584d624d28306c223f5569b2cf17752230d8 100644 (file)
--- a/bacula/scripts/bacula-ctl-dir.in
+++ b/bacula/scripts/bacula-ctl-dir.in
@@ -208,7 +208,7 @@ case "$1" in
            OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
         fi
 
-        if [ "x${VALGRIND}" = "x1" ]; then
+        if [ "x${VALGRIND_DIR}" = "x1" ]; then
            valgrind --leak-check=full ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
         else
            ${BACDIRBIN}/bacula-dir $2 $3 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf

diff --git a/bacula/scripts/bacula-ctl-fd.in b/bacula/scripts/bacula-ctl-fd.in
index 86ad8db8db046576696aa218671e2c795664245e..3393ce633bfad690f3d19f0a4cb185b9c97ff2d4 100644 (file)
--- a/bacula/scripts/bacula-ctl-fd.in
+++ b/bacula/scripts/bacula-ctl-fd.in
@@ -208,7 +208,11 @@ case "$1" in
            OPTIONS="${OPTIONS} -g ${FD_GROUP}"
         fi
 
-        ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+        if [ "x${VALGRIND_FD}" = "x1" ]; then
+           valgrind --leak-check=full ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+        else
+           ${BACFDBIN}/bacula-fd $2 $3 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
+        fi
       }
       ;;
 

diff --git a/bacula/scripts/bacula-ctl-sd.in b/bacula/scripts/bacula-ctl-sd.in
index 99ee11530b5738b5cfebcb7c72c36936f739f7a0..1f8592106a8988ffec8597cea9804f20bc5d6922 100644 (file)
--- a/bacula/scripts/bacula-ctl-sd.in
+++ b/bacula/scripts/bacula-ctl-sd.in
@@ -208,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
       }
       ;;