Added sourcing of system specific configuration file /etc/lsbackups.conf if it exists.

This follows the sourcing of config.sh, allowing overrides of the defaults.

diff --git a/scripts/burn-imgs.sh b/scripts/burn-imgs.sh
index 5d030bf5f46918d09b5975e2abe8eaf844600531..f33ea99251242a5a1affdc700c0df307f995d8b7 100755 (executable)
--- a/scripts/burn-imgs.sh
+++ b/scripts/burn-imgs.sh
@@ -3,8 +3,16 @@
 export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 
 cronstopstart="/etc/init.d/cron"
+
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+if [ -f /etc/lsbackups.conf ]
+then
+  . /etc/lsbackups.conf
+fi 
+
 # If the noburn file is there then don't burn.
 [ -f "$noburnfile" ] && exit 0
 

diff --git a/scripts/cron-burn.sh b/scripts/cron-burn.sh
index 496793598d3785db118f3699ba6b00e879723417..f2ca41480a0f72984a3130338fcd67858103421d 100755 (executable)
--- a/scripts/cron-burn.sh
+++ b/scripts/cron-burn.sh
@@ -2,8 +2,15 @@
 
 export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+if [ -f /etc/lsbackups.conf ]
+then
+  . /etc/lsbackups.conf
+fi
+
 # burn-imgs.sh needs to be detached so that it can stop and start cron without
 # dying itself.
 

diff --git a/scripts/cron-pack.sh b/scripts/cron-pack.sh
index a757da9a38a92456578303b880c5e4fede5d6bb4..62c65ad746dcac88e2bb5413ab212694e88bd1db 100755 (executable)
--- a/scripts/cron-pack.sh
+++ b/scripts/cron-pack.sh
@@ -2,8 +2,15 @@
 
 export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+if [ -f /etc/lsbackups.conf ]
+then
+  . /etc/lsbackups.conf
+fi 
+
 if [ -n "$(find $lastbackupfile -mtime +14)" -o -n "$(cat $statusfile | grep -i incomplete)" ]; then
   echo "Running backups from cron..."
   setsid pack-image.sh

diff --git a/scripts/eject-disk.sh b/scripts/eject-disk.sh
index 32220f1bfaa5f0bdf96e9d04da81d8bc11d73e4e..ca2795cc1051266c84332b2287f15bed428dfacc 100755 (executable)
--- a/scripts/eject-disk.sh
+++ b/scripts/eject-disk.sh
@@ -2,8 +2,15 @@
 
 export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+if [ -f /etc/lsbackups.conf ]
+then
+  . /etc/lsbackups.conf
+fi 
+
 eject $dev
 
 rm -f $noburnfile

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index ec7b1da74e99b2e8a1738eed0190c3f2c6feeb41..9dcc6bf4191a9d16f54452d32b5132ebf36d91b5 100755 (executable)
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -4,8 +4,15 @@ scriptsdir=$(dirname $0)
 
 export PATH=$scriptsdir:/bin:/usr/bin:/sbin:/usr/sbin
 
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+if [ -f /etc/lsbackups.conf ]
+then
+  . /etc/lsbackups.conf
+fi 
+
 # file locations and other values
 today=$(date +%Y%m%d%H%M%S)
 isoimage="$imagedir/$today.img"