Allow custom variables and checks from debian/ubuntu startup scripts

diff --git a/bacula/platforms/debian/bacula-dir.in b/bacula/platforms/debian/bacula-dir.in
index 1a1d7cb34f961e0f5f836f998ea73d6693798a5a..73253dce8e0590ff45472861a3f6c88bce4e0f4c 100644 (file)
--- a/bacula/platforms/debian/bacula-dir.in
+++ b/bacula/platforms/debian/bacula-dir.in
@@ -35,6 +35,10 @@ if [ -n "`getent services ${NAME}`" ]; then
    BPORT=`getent services ${NAME} | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
 
+if [ -f /etc/default/$NAME ]; then
+   . /etc/default/$NAME
+fi
+
 PIDFILE=@piddir@/${NAME}.${BPORT}.pid
 
 if [ "x${BUSER}" != "x" ]; then

diff --git a/bacula/platforms/debian/bacula-fd.in b/bacula/platforms/debian/bacula-fd.in
index 93cf0f81c60eadeff22056e59a0d5151ff0002cc..181625ce7d52d5bec28775cc0e153fe08237e1d9 100644 (file)
--- a/bacula/platforms/debian/bacula-fd.in
+++ b/bacula/platforms/debian/bacula-fd.in
@@ -35,6 +35,10 @@ if [ -n "`getent services ${NAME}`" ]; then
    BPORT=`getent services ${NAME} | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
 
+if [ -f /etc/default/$NAME ]; then
+   . /etc/default/$NAME
+fi
+
 PIDFILE=@piddir@/${NAME}.${BPORT}.pid
 
 if [ "x${BUSER}" != "x" ]; then

diff --git a/bacula/platforms/debian/bacula-sd.in b/bacula/platforms/debian/bacula-sd.in
index fd5b7e809c7145303b00d97474a747995c66ba0c..175330475560742db4e70a31ebcb13fa0544dbe4 100644 (file)
--- a/bacula/platforms/debian/bacula-sd.in
+++ b/bacula/platforms/debian/bacula-sd.in
@@ -35,6 +35,10 @@ if [ -n "`getent services ${NAME}`" ]; then
    BPORT=`getent services ${NAME} | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
 
+if [ -f /etc/default/$NAME ]; then
+   . /etc/default/$NAME
+fi
+
 PIDFILE=@piddir@/${NAME}.${BPORT}.pid
 
 if [ "x${BUSER}" != "x" ]; then

diff --git a/bacula/platforms/ubuntu/bacula-dir.in b/bacula/platforms/ubuntu/bacula-dir.in
index 5b460a2e97e4a5574eaa7dd7d18a6a7a9f8b2644..c7d99642cabc5ab392c3d461eb35ee59f281a5d4 100644 (file)
--- a/bacula/platforms/ubuntu/bacula-dir.in
+++ b/bacula/platforms/ubuntu/bacula-dir.in
@@ -42,6 +42,10 @@ if [ -n "`getent services ${NAME}`" ]; then
    BPORT=`getent services ${NAME} | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
 
+if [ -f /etc/default/$NAME ]; then
+   . /etc/default/$NAME
+fi
+
 mkdir -p @piddir@
 PIDFILE=@piddir@/${NAME}.${BPORT}.pid
 

diff --git a/bacula/platforms/ubuntu/bacula-fd.in b/bacula/platforms/ubuntu/bacula-fd.in
index 49510f3ff6340a6afa778899ea02dc6b427e46a9..9fb7aff06b8175b67cfda4bc84fc2f21474df532 100644 (file)
--- a/bacula/platforms/ubuntu/bacula-fd.in
+++ b/bacula/platforms/ubuntu/bacula-fd.in
@@ -42,6 +42,10 @@ if [ -n "`getent services ${NAME}`" ]; then
    BPORT=`getent services ${NAME} | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
 
+if [ -f /etc/default/$NAME ]; then
+   . /etc/default/$NAME
+fi
+
 mkdir -p @piddir@
 PIDFILE=@piddir@/${NAME}.${BPORT}.pid
 

diff --git a/bacula/platforms/ubuntu/bacula-sd.in b/bacula/platforms/ubuntu/bacula-sd.in
index 46b48d7aa043125235128f4cb164620e9eaf5673..e778ea961333b6f28240c3806787de45193837f6 100644 (file)
--- a/bacula/platforms/ubuntu/bacula-sd.in
+++ b/bacula/platforms/ubuntu/bacula-sd.in
@@ -42,6 +42,10 @@ if [ -n "`getent services ${NAME}`" ]; then
    BPORT=`getent services ${NAME} | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
 
+if [ -f /etc/default/$NAME ]; then
+   . /etc/default/$NAME
+fi
+
 mkdir -p @piddir@
 PIDFILE=@piddir@/${NAME}.${BPORT}.pid