- $2 does not get passed to startup opts, use sysconfig instead

Changed files:
    bacula-dir.init -> 1.15
    bacula-dir.sysconfig -> 1.2
    bacula-fd.init -> 1.13
    bacula-fd.sysconfig -> 1.2
    bacula-sd.init -> 1.14
    bacula-sd.sysconfig -> 1.2

diff --git a/bacula-dir.init b/bacula-dir.init
index 78c77399cc1ad60ec3fc7aa07533737e37d27b26..a7517ed6b7ab0f854dced7695587a99bb45979a3 100644 (file)
--- a/bacula-dir.init
+++ b/bacula-dir.init
@@ -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 @@ start() {
        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
 }

diff --git a/bacula-dir.sysconfig b/bacula-dir.sysconfig
index 2fe7558e5014076629c6127e69c95368dd935dbc..f5b360a9b4f7a0bda83753e49ebd0428d749e646 100644 (file)
--- a/bacula-dir.sysconfig
+++ b/bacula-dir.sysconfig
@@ -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=""

diff --git a/bacula-fd.init b/bacula-fd.init
index 882fbd1a6d60478e3049560ad4df36e39e37f5b1..11b947e08547554d01744100e60213457e67525b 100644 (file)
--- a/bacula-fd.init
+++ b/bacula-fd.init
@@ -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 @@ start() {
        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
 }

diff --git a/bacula-fd.sysconfig b/bacula-fd.sysconfig
index 42121dcb7a06311e424d3578e9a0183c57bbd36e..1fb42284a3e2b64a8e5822b25074d1edd2412d66 100644 (file)
--- a/bacula-fd.sysconfig
+++ b/bacula-fd.sysconfig
@@ -7,3 +7,6 @@ SERVICE_RUN_NICE_LEVEL="+5"
 # 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=""

diff --git a/bacula-sd.init b/bacula-sd.init
index c36a18f46e6acb84868e847e4fc0f681fa8fbfe2..23e732dedcad4293d5e9dfe015a6a2648510044b 100644 (file)
--- a/bacula-sd.init
+++ b/bacula-sd.init
@@ -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 @@ start() {
        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
 }

diff --git a/bacula-sd.sysconfig b/bacula-sd.sysconfig
index bdbba93cb1d3945cbfe78a4eeff1cc1d19cf5053..35432d82aeb74b0d93be5c3b0fd43a935603832b 100644 (file)
--- a/bacula-sd.sysconfig
+++ b/bacula-sd.sysconfig
@@ -7,3 +7,6 @@ SERVICE_RUN_NICE_LEVEL="+5"
 # 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=""