Change license as per agreement with FSFE

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

diff --git a/bacula/scripts/bacula-ctl-fd.in b/bacula/scripts/bacula-ctl-fd.in
index c359eaea614ebde9843244ecd9bd0d841daed8e4..0032f0ba6077ffcd208d1e4ac224aa1d2a4df6e8 100644 (file)
--- a/bacula/scripts/bacula-ctl-fd.in
+++ b/bacula/scripts/bacula-ctl-fd.in
@@ -2,8 +2,7 @@
 #
 #   Bacula(R) - The Network Backup Solution
 #
-#   Copyright (C) 2000-2015 Kern Sibbald
-#   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+#   Copyright (C) 2000-2016 Kern Sibbald
 #
 #   The original author of Bacula is Kern Sibbald, with contributions
 #   from many others, a complete list can be found in the file AUTHORS.
@@ -19,7 +18,7 @@
 #   Bacula(R) is a registered trademark of Kern Sibbald.
 #
 # bacula-ctl-fd This shell script takes care of starting and stopping
-#               the bacula File daemon.
+#              the bacula File daemon.
 #
 #   This is pretty much watered down version of the RedHat script
 #   that works on Solaris as well as Linux, but it won't work everywhere.
@@ -50,7 +49,7 @@ FD_PORT=@fd_port@
 FD_USER=@fd_user@
 FD_GROUP=@fd_group@
 Bacula="@BACULA@"
-PIDOF=@PIDOF@   
+PIDOF=@PIDOF@  
 
 # A function to stop a program.
 killproc() {
@@ -79,31 +78,31 @@ killproc() {
    # Kill it.
    if [ "$pid" != "" ] ; then
       if [ "$notset" = "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
-                 sleep 1
-                 if ${PS} -p "$pid" >/dev/null 2>&1 ; then
-                     sleep 3
-                     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
-          RC=$?
-          [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown"
+        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
+                sleep 1
+                if ${PS} -p "$pid" >/dev/null 2>&1 ; then
+                    sleep 3
+                    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
+         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
-            kill $killlevel $pid 2>/dev/null
-            RC=$?
-            [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel"
-         fi
+        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"
+        fi
       fi
    else
       failure "$base shutdown"
@@ -131,8 +130,8 @@ pidofproc() {
    if [ -f ${PIDDIR}/$base.$2.pid ] ; then
       pid=`head -n 1 ${PIDDIR}/$base.$2.pid`
       if [ "$pid" != "" ] ; then
-         echo $pid
-         return 0
+        echo $pid
+        return 0
       fi
    fi
 
@@ -171,12 +170,12 @@ status() {
       return 0
    else
       pid=`${PSCMD} | ${AWK} 'BEGIN { prog=ARGV[1]; ARGC=1 } 
-            { if ((prog == $2) || (("(" prog ")") == $2) ||
-                 (("[" prog "]") == $2) ||
-                 ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
+           { if ((prog == $2) || (("(" prog ")") == $2) ||
+                (("[" prog "]") == $2) ||
+                ((prog ":") == $2)) { print $1 ; exit 0 } }' $1`
       if [ "$pid" != "" ] ; then
-         echo "$base (pid $pid) is running..."
-         return 0
+        echo "$base (pid $pid) is running..."
+        return 0
       fi
    fi
 
@@ -184,8 +183,8 @@ status() {
    if [ -f ${PIDDIR}/$base.$2.pid ] ; then
       pid=`head -n 1 ${PIDDIR}/$base.$2.pid`
       if [ "$pid" != "" ] ; then
-         echo "$base dead but pid file exists"
-         return 1
+        echo "$base dead but pid file exists"
+        return 1
       fi
    fi
    # See if the subsys lock exists
@@ -216,29 +215,29 @@ fi
 case "$1" in
    start)
       [ -x ${BACFDBIN}/bacula-fd ] && {
-         echo "Starting the $Bacula File daemon"
-         OPTIONS=''
-         if [ "${FD_USER}" != '' ]; then
-            OPTIONS="${OPTIONS} -u ${FD_USER}"
-         fi
+        echo "Starting the $Bacula File daemon"
+        OPTIONS=''
+        if [ "${FD_USER}" != '' ]; then
+           OPTIONS="${OPTIONS} -u ${FD_USER}"
+        fi
 
-         if [ "${FD_GROUP}" != '' ]; then
-            OPTIONS="${OPTIONS} -g ${FD_GROUP}"
-         fi
+        if [ "${FD_GROUP}" != '' ]; then
+           OPTIONS="${OPTIONS} -g ${FD_GROUP}"
+        fi
 
-         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
+        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
       }
       ;;
 
    stop)
       # Stop the FD first so that SD will fail jobs and update catalog
       [ -x ${BACFDBIN}/bacula-fd ] && {
-         echo "Stopping the $Bacula File daemon"
-         killproc ${BACFDBIN}/bacula-fd ${FD_PORT} $2
+        echo "Stopping the $Bacula File daemon"
+        killproc ${BACFDBIN}/bacula-fd ${FD_PORT} $2
       }
       ;;