packages: bacula/bacula-dir.init, bacula/bacula-dir.sysconfig, bacula/bacul...

[glen]

Author: glen                         Date: Thu Oct 14 19:43:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- $2 does not get passed to startup opts, use sysconfig instead

---- Files affected:
packages/bacula:
   bacula-dir.init (1.14 -> 1.15) , bacula-dir.sysconfig (1.1 -> 1.2) , bacula-fd.init (1.12 -> 1.13) , bacula-fd.sysconfig (1.1 -> 1.2) , bacula-sd.init (1.13 -> 1.14) , bacula-sd.sysconfig (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/bacula/bacula-dir.init
diff -u packages/bacula/bacula-dir.init:1.14 packages/bacula/bacula-dir.init:1.15
--- packages/bacula/bacula-dir.init:1.14	Thu Oct 14 21:36:00 2010
+++ packages/bacula/bacula-dir.init	Thu Oct 14 21:43:10 2010
@@ -12,6 +12,7 @@
 
 BACULA_DIR_USER="bacula"
 BACULA_DIR_GROUP="bacula"
+BACULA_DIR_OPTIONS=""
 [ -f /etc/sysconfig/bacula-dir ] && . /etc/sysconfig/bacula-dir
 
 start() {
@@ -22,7 +23,7 @@
 	fi
 
 	msg_starting "Bacula Director"
-	daemon /usr/sbin/bacula-dir -u  "$BACULA_DIR_USER" -g "$BACULA_DIR_GROUP" $2 -c /etc/bacula/bacula-dir.conf
+	daemon /usr/sbin/bacula-dir -u  "$BACULA_DIR_USER" -g "$BACULA_DIR_GROUP" -c /etc/bacula/bacula-dir.conf $BACULA_DIR_OPTIONS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
 }

================================================================
Index: packages/bacula/bacula-dir.sysconfig
diff -u packages/bacula/bacula-dir.sysconfig:1.1 packages/bacula/bacula-dir.sysconfig:1.2
--- packages/bacula/bacula-dir.sysconfig:1.1	Fri Nov 26 13:30:35 2004
+++ packages/bacula/bacula-dir.sysconfig	Thu Oct 14 21:43:10 2010
@@ -2,3 +2,11 @@
 
 # Define nice level for Bacula Direcror
 SERVICE_RUN_NICE_LEVEL="+5"
+
+# Define user and group for Bacula Dir services
+# The user/group must be able to access config and database for director
+BACULA_FD_USER=bacula
+BACULA_FD_GROUP=bacula
+
+# Extra options passed to bacula-dir on startup
+#BACULA_DIR_OPTIONS=""

================================================================
Index: packages/bacula/bacula-fd.init
diff -u packages/bacula/bacula-fd.init:1.12 packages/bacula/bacula-fd.init:1.13
--- packages/bacula/bacula-fd.init:1.12	Thu Oct 14 21:34:28 2010
+++ packages/bacula/bacula-fd.init	Thu Oct 14 21:43:10 2010
@@ -12,6 +12,7 @@
 
 BACULA_FD_USER="bacula"
 BACULA_FD_GROUP="bacula"
+BACULA_FD_OPTIONS=""
 [ -f /etc/sysconfig/bacula-fd ] && . /etc/sysconfig/bacula-fd
 
 start() {
@@ -22,7 +23,7 @@
 	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
+	daemon /usr/sbin/bacula-fd -u "$BACULA_FD_USER" -g "$BACULA_FD_GROUP" -c /etc/bacula/bacula-fd.conf $BACULA_FD_OPTIONS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-fd
 }

================================================================
Index: packages/bacula/bacula-fd.sysconfig
diff -u packages/bacula/bacula-fd.sysconfig:1.1 packages/bacula/bacula-fd.sysconfig:1.2
--- packages/bacula/bacula-fd.sysconfig:1.1	Fri Nov 26 13:30:35 2004
+++ packages/bacula/bacula-fd.sysconfig	Thu Oct 14 21:43:10 2010
@@ -7,3 +7,6 @@
 # The user/group must be able to access all the data to backup
 BACULA_FD_USER=root
 BACULA_FD_GROUP=root
+
+# Extra options passed to bacula-fd on startup
+#BACULA_DIR_OPTIONS=""

================================================================
Index: packages/bacula/bacula-sd.init
diff -u packages/bacula/bacula-sd.init:1.13 packages/bacula/bacula-sd.init:1.14
--- packages/bacula/bacula-sd.init:1.13	Thu Oct 14 21:34:28 2010
+++ packages/bacula/bacula-sd.init	Thu Oct 14 21:43:10 2010
@@ -12,6 +12,7 @@
 
 BACULA_SD_USER="bacula"
 BACULA_SD_GROUP="bacula"
+BACULA_SD_OPTIONS=""
 [ -f /etc/sysconfig/bacula-sd ] && . /etc/sysconfig/bacula-sd
 
 start() {
@@ -22,7 +23,7 @@
 	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
+	daemon /usr/sbin/bacula-sd -u "$BACULA_SD_USER" -g "$BACULA_SD_GROUP" -c /etc/bacula/bacula-sd.conf $BACULA_SD_OPTIONS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-sd
 }

================================================================
Index: packages/bacula/bacula-sd.sysconfig
diff -u packages/bacula/bacula-sd.sysconfig:1.1 packages/bacula/bacula-sd.sysconfig:1.2
--- packages/bacula/bacula-sd.sysconfig:1.1	Fri Nov 26 13:30:35 2004
+++ packages/bacula/bacula-sd.sysconfig	Thu Oct 14 21:43:10 2010
@@ -7,3 +7,6 @@
 # The user/group must be able to access the backup devices used
 BACULA_SD_USER=bacula
 BACULA_SD_GROUP=bacula
+
+# Extra options passed to bacula-sd on startup
+#BACULA_SD_OPTIONS=""
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-dir.init?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-dir.sysconfig?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-fd.init?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-fd.sysconfig?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-sd.init?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-sd.sysconfig?r1=1.1&r2=1.2&f=u