From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 22 Jan 2011 17:00:06 +0000 (+0100)
Subject: Tweak bacula-ctl scripts for valgrind
X-Git-Tag: Release-7.0.0~1212
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cf3884b87f6749fd08498af20dd03182745b6109;p=bacula%2Fbacula

Tweak bacula-ctl scripts for valgrind
---

diff --git a/bacula/scripts/bacula-ctl-dir.in b/bacula/scripts/bacula-ctl-dir.in
index 65cb8883e9..0389584d62 100644
--- 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 86ad8db8db..3393ce633b 100644
--- 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 99ee11530b..1f8592106a 100644
--- 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
       }
       ;;