- unify

[packages/bacula.git] / bacula-dir.init

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