Author: glen Date: Thu Oct 14 19:33:43 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- unify
---- Files affected:
packages/bacula:
bacula-dir.init (1.11 -> 1.12) , bacula-fd.init (1.10 -> 1.11) ,
bacula-sd.init (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/bacula/bacula-dir.init
diff -u packages/bacula/bacula-dir.init:1.11
packages/bacula/bacula-dir.init:1.12
--- packages/bacula/bacula-dir.init:1.11 Sat Nov 24 22:38:36 2007
+++ packages/bacula/bacula-dir.init Thu Oct 14 21:33:38 2010
@@ -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
================================================================
Index: packages/bacula/bacula-fd.init
diff -u packages/bacula/bacula-fd.init:1.10 packages/bacula/bacula-fd.init:1.11
--- packages/bacula/bacula-fd.init:1.10 Sat Nov 24 22:38:36 2007
+++ packages/bacula/bacula-fd.init Thu Oct 14 21:33:38 2010
@@ -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 @@
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
================================================================
Index: packages/bacula/bacula-sd.init
diff -u packages/bacula/bacula-sd.init:1.11 packages/bacula/bacula-sd.init:1.12
--- packages/bacula/bacula-sd.init:1.11 Sat Nov 24 22:38:36 2007
+++ packages/bacula/bacula-sd.init Thu Oct 14 21:33:38 2010
@@ -16,26 +16,28 @@
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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-dir.init?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-fd.init?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-sd.init?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
