ebl tweak

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

diff --git a/bacula/scripts/bacula-ctl-dir.in b/bacula/scripts/bacula-ctl-dir.in
index a418c4ddb7e865547c2ecb59e4d76eb06d37f080..a455f93857344b622ce3511600e703de9bc11a51 100644 (file)
--- a/bacula/scripts/bacula-ctl-dir.in
+++ b/bacula/scripts/bacula-ctl-dir.in
@@ -61,27 +61,27 @@ killproc() {
    # Kill it.
    if [ "$pid" != "" ] ; then
       if [ "$notset" = "1" ] ; then
-        if ${PS} -p $pid>/dev/null 2>&1; then
+        if ${PS} -p "$pid">/dev/null 2>&1; then
             # TERM first, then KILL if not dead
             kill -TERM $pid 2>/dev/null
             sleep 1
-            if ${PS} -p $pid >/dev/null 2>&1 ; then
+            if ${PS} -p "$pid" >/dev/null 2>&1 ; then
                 sleep 1
-                if ${PS} -p $pid >/dev/null 2>&1 ; then
+                if ${PS} -p "$pid" >/dev/null 2>&1 ; then
                     sleep 3
-                    if ${PS} -p $pid >/dev/null 2>&1 ; then
+                    if ${PS} -p "$pid" >/dev/null 2>&1 ; then
                         kill -KILL $pid 2>/dev/null
                     fi
                 fi
             fi
          fi
-         ${PS} -p $pid >/dev/null 2>&1
+         ${PS} -p "$pid" >/dev/null 2>&1
          RC=$?
          [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
       #    RC=$((! $RC))
       # use specified level only
       else
-        if ${PS} -p $pid >/dev/null 2>&1; then
+        if ${PS} -p "$pid" >/dev/null 2>&1; then
            kill $killlevel $pid 2>/dev/null
            RC=$?
            [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
@@ -208,7 +208,11 @@ case "$1" in
            OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
         fi
 
-        ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
+        if [ "x${VALGRIND}" = "x1" ]; then
+           valgrind --leak-check=full ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
+        else
+           ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c ${BACDIRCFG}/bacula-dir.conf
+        fi
       }
       ;;