- unify

Changed files:
    bacula-dir.init -> 1.12
    bacula-fd.init -> 1.11
    bacula-sd.init -> 1.12

diff --git a/bacula-dir.init b/bacula-dir.init
index cc85b3da9fd2c9c7c8fd0eff2dc754260f3015eb..08c329bbfb53849424ef6e85fa924166d20d598b 100644 (file)
--- a/bacula-dir.init
+++ b/bacula-dir.init
@@ -12,26 +12,28 @@
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/bacula-dir ]; then
-               msg_starting "Bacula Director"
-               daemon /usr/sbin/bacula-dir -u bacula -g bacula $2 -c /etc/bacula/bacula-dir.conf
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
-       else
+       if [ -f /var/lock/subsys/bacula-dir ]; then
                msg_already_running "Bacula Director"
+               return
        fi
+
+       msg_starting "Bacula Director"
+       daemon /usr/sbin/bacula-dir -u bacula -g bacula $2 -c /etc/bacula/bacula-dir.conf
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
 }
 
 stop() {
-       if [ -f /var/lock/subsys/bacula-dir ]; then
-               # Stop daemons.
-               msg_stopping "Bacula Director"
-               killproc /usr/sbin/bacula-dir
-               RETVAL=$?
-               rm -f /var/lock/subsys/bacula-dir
-       else
+       if [ ! -f /var/lock/subsys/bacula-dir ]; then
                msg_not_running "Bacula Director"
+               return
        fi
+
+       # Stop daemons.
+       msg_stopping "Bacula Director"
+       killproc /usr/sbin/bacula-dir
+       RETVAL=$?
+       rm -f /var/lock/subsys/bacula-dir
 }
 
 RETVAL=0

diff --git a/bacula-fd.init b/bacula-fd.init
index 3dbde3d758d27809d9351d916c121a5bb66358c1..bd8004affae76fe556a93c45409500e55e2df099 100644 (file)
--- a/bacula-fd.init
+++ b/bacula-fd.init
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # bacula          This shell script takes care of starting and stopping
 #                 the bacula File daemon.
@@ -16,26 +16,28 @@ BACULA_FD_GROUP="bacula"
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/bacula-fd ]; then
-               msg_starting "Bacula File"
-               daemon /usr/sbin/bacula-fd -u "$BACULA_FD_USER" -g "$BACULA_FD_GROUP" $2 -c /etc/bacula/bacula-fd.conf
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-fd
-       else
+       if [ -f /var/lock/subsys/bacula-fd ]; then
                msg_already_running "Bacula File"
+               return
        fi
+
+       msg_starting "Bacula File"
+       daemon /usr/sbin/bacula-fd -u "$BACULA_FD_USER" -g "$BACULA_FD_GROUP" $2 -c /etc/bacula/bacula-fd.conf
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-fd
 }
 
 stop() {
-       if [ -f /var/lock/subsys/bacula-fd ]; then
-               # Stop daemons.
-               msg_stopping "Bacula File"
-               killproc /usr/sbin/bacula-fd
-               RETVAL=$?
-               rm -f /var/lock/subsys/bacula-fd
-       else
+       if [ ! -f /var/lock/subsys/bacula-fd ]; then
                msg_not_running "Bacula File"
+               return
        fi
+
+       # Stop daemons.
+       msg_stopping "Bacula File"
+       killproc /usr/sbin/bacula-fd
+       RETVAL=$?
+       rm -f /var/lock/subsys/bacula-fd
 }
 
 case "$1" in

diff --git a/bacula-sd.init b/bacula-sd.init
index 67b41ee43a147182ed23b049bba1b929caad4922..c5b891d891a74d8d593264de518db8e6801c2ee3 100644 (file)
--- a/bacula-sd.init
+++ b/bacula-sd.init
@@ -16,26 +16,28 @@ BACULA_SD_GROUP="bacula"
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/bacula-sd ]; then
-               msg_starting "Bacula Storage"
-               daemon /usr/sbin/bacula-sd -u "$BACULA_SD_USER" -g "$BACULA_SD_GROUP" $2 -c /etc/bacula/bacula-sd.conf
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-sd
-       else
+       if [ -f /var/lock/subsys/bacula-sd ]; then
                msg_already_running "Bacula Storage"
+               return
        fi
+
+       msg_starting "Bacula Storage"
+       daemon /usr/sbin/bacula-sd -u "$BACULA_SD_USER" -g "$BACULA_SD_GROUP" $2 -c /etc/bacula/bacula-sd.conf
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-sd
 }
 
 stop() {
-       if [ -f /var/lock/subsys/bacula-sd ]; then
-               # Stop daemons.
-               msg_stopping "Bacula Storage"
-               killproc /usr/sbin/bacula-sd
-               RETVAL=$?
-               rm -f /var/lock/subsys/bacula-sd
-       else
+       if [ ! -f /var/lock/subsys/bacula-sd ]; then
                msg_not_running "Bacula Storage"
+               return
        fi
+
+       # Stop daemons.
+       msg_stopping "Bacula Storage"
+       killproc /usr/sbin/bacula-sd
+       RETVAL=$?
+       rm -f /var/lock/subsys/bacula-sd
 }
 
 case "$1" in