From cf3884b87f6749fd08498af20dd03182745b6109 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 22 Jan 2011 18:00:06 +0100 Subject: [PATCH] Tweak bacula-ctl scripts for valgrind --- bacula/scripts/bacula-ctl-dir.in | 2 +- bacula/scripts/bacula-ctl-fd.in | 6 +++++- bacula/scripts/bacula-ctl-sd.in | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) 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 } ;; -- 2.39.5