Added available disk space check & new backupeveryXdays config var.

diff --git a/scripts/config.sh b/scripts/config.sh
index ff58479670bc1506ef28292b4e9c757ac2d7060e..c676f093d18bece30b2a0ae718b5bb0087310628 100755 (executable)
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -11,6 +11,7 @@ lastbackupfile="$imagedir/lastbackup"
 dev="/dev/dvdrw"
 sdev="ATA:1,0,0"
 noburnfile="$imagedir/noburn"
+backupeveryXdays=15
 
 # These are exported so lsbackups can have access to them
 export backupdbin="$datadir/backups.db"

diff --git a/scripts/cron-pack.sh b/scripts/cron-pack.sh
index 906b010ac1c15048a5cda03e48174df938c8f3fd..f34489a0d3d59ac909b0d228a7c3d5435556b3de 100755 (executable)
--- a/scripts/cron-pack.sh
+++ b/scripts/cron-pack.sh
@@ -8,8 +8,7 @@ export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 # source the system specific configuration
 [ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 
-days=15
-minutes=$(($days * 1440 - 60))
+minutes=$(($backupeveryXdays * 1440 - 60))
 
 if [ -n "$(find $lastbackupfile -mmin +$minutes)" -o -n "$(cat $statusfile | grep -i incomplete)" ]; then
   echo "Running backups from cron..."

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index 2bdb75e920134b46ee49e9d8ca9756eae10d93c6..ce985fa2eb13c00d93cfd11ec07faa36af7b3393 100755 (executable)
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -22,6 +22,11 @@ isoimage="$imagedir/$today.iso"
 isomountdir="$isoimage.mnt"
 restorescript="$scriptsdir/restore.sh"
 
+echo "-> Checking for available disk space on $imagedir"
+available=$(df $imagedir | awk '{print$4}' | grep -E "[0-9]+")
+required=$((imagesizemb*1024))
+[ $required -gt $available ] && err "Not enough space for the backup image on $imagedir"
+
 echo "-> Creating directories"
 mkdir --mode=700 -p $datadir $imagedir $isomountdir $tmpdir
 if [ $? != 0 ]; then