X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fscripts%2Fbacula-ctl-sd.in;h=9046f5b8fbe1b34f48d9bcb3508fa8113cc2bda4;hb=f51b602287b3dc2ed459c4e59376d973ec62c964;hp=d918cbcbe5ce6107fc62c17a4b2e444850da019c;hpb=2a01e1677f1f6309935603e82156f074420503ab;p=bacula%2Fbacula

diff --git a/bacula/scripts/bacula-ctl-sd.in b/bacula/scripts/bacula-ctl-sd.in
index d918cbcbe5..9046f5b8fb 100644
--- a/bacula/scripts/bacula-ctl-sd.in
+++ b/bacula/scripts/bacula-ctl-sd.in
@@ -31,7 +31,7 @@ SD_PORT=@sd_port@
 
 SD_USER=@sd_user@
 SD_GROUP=@sd_group@
-
+Bacula="@BACULA@"
 PIDOF=@PIDOF@	
 
 # A function to stop a program.
@@ -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"
@@ -197,7 +197,7 @@ fi
 case "$1" in
    start)
       [ -x ${BACSDBIN}/bacula-sd ] && {
-	 echo "Starting the Bacula Storage daemon"
+	 echo "Starting the $Bacula Storage daemon"
 	 OPTIONS=''
 	 if [ "${SD_USER}" != '' ]; then
 	    OPTIONS="${OPTIONS} -u ${SD_USER}"
@@ -207,14 +207,14 @@ case "$1" in
 	    OPTIONS="${OPTIONS} -g ${SD_GROUP}"
 	 fi
 
-	 ${BACSDBIN}/bacula-sd $2 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
+	 ${BACSDBIN}/bacula-sd $2 $3 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
       }
       ;;
 
 
    stop)
       [ -x ${BACSDBIN}/bacula-sd ] && {
-	 echo "Stopping the Bacula Storage daemon"
+	 echo "Stopping the $Bacula Storage daemon"
 	 killproc ${BACSDBIN}/bacula-sd ${SD_PORT}
       }
       ;;