Merge a fix to release-0.1

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

diff --git a/scripts/config.sh b/scripts/config.sh
index 056bb2c39e8bebd463ba02c68896c578ee07b311..c3b4a26a7a7b1fa8a164a85edec1fbb197f9cfc5 100755 (executable)
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -23,3 +23,11 @@ backupdirs="
 /var/lib/iptables
 /var/lib/mailman
 "
+
+excludedirs="
+"
+
+function err() {
+  echo 2>&1 "-E- $1"
+  exit 1
+}

diff --git a/scripts/cron-burn.sh b/scripts/cron-burn.sh
index 496793598d3785db118f3699ba6b00e879723417..4fe9a0b165ef26c4e84a82fa1afe38163330709c 100755 (executable)
--- a/scripts/cron-burn.sh
+++ b/scripts/cron-burn.sh
@@ -2,8 +2,12 @@
 
 export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
+
 # 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 2127e42b119b723be914f001b9d6c141ff1b15ab..906b010ac1c15048a5cda03e48174df938c8f3fd 100755 (executable)
--- a/scripts/cron-pack.sh
+++ b/scripts/cron-pack.sh
@@ -2,8 +2,12 @@
 
 export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
+
 days=15
 minutes=$(($days * 1440 - 60))
 

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

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index ec7b1da74e99b2e8a1738eed0190c3f2c6feeb41..9a06f718bfb72a24ea7fbe691de98b40a36fa6bd 100755 (executable)
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -4,52 +4,104 @@ scriptsdir=$(dirname $0)
 
 export PATH=$scriptsdir:/bin:/usr/bin:/sbin:/usr/sbin
 
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
+
 # file locations and other values
 today=$(date +%Y%m%d%H%M%S)
 isoimage="$imagedir/$today.img"
 isomountdir="$isoimage.mnt"
 restorescript="$scriptsdir/restore.sh"
 
-echo "Creating directories"
+echo "-> Creating directories"
 mkdir --mode=700 -p $datadir $imagedir $isomountdir $tmpdir
+if [ $? != 0 ] 
+then
+  if test -d $isomountdir
+  then
+    rm -rf $isomountdir
+  fi
+  err "Unable to create the following directories:
+  $datadir $imagedir $isomountdir $tmpdir"
+fi
+
+echo "-> Creating the iso image in $isoimage"
+dd of=$isoimage bs=1M count=0 seek=4440
+
+[ $? != 0 ] && err "dd failed to create $isoimage"
 
-echo "Creating the iso image in $isoimage"
-dd if=/dev/null of=$isoimage bs=1M count=0 seek=4440
 mke2fs -b 2048 -F $isoimage
 
-echo "Mounting the iso image"
+if [ $? != 0 ]
+then
+  rm -rf $isomountdir $isoimage
+  err "Unable to create the iso image: $isoimage"
+fi
+
+echo "-> Mounting the iso image"
 mount -t ext2 -o loop $isoimage $isomountdir
+if [ $? != 0 ]
+then
+  rm -rf $isomountdir $isoimage
+  err "Unable to mount the iso image: $isoimage -> $isomountdir"
+fi
+
+echo "-> Directories being backedup and excluded:"
+echo "backupdirs: $backupdirs"
+echo "excludedirs: $excludedirs"
 
-echo "Running find to get the status of files"
+echo "-> Running find to get the status of files"
 {
   for type in d f l; do
     findformat="$type %#m %u %g %s %CY%Cm%Cd%CH%CM%CS 0 %p\0"
-    find $backupdirs -type $type -printf "$findformat"
+    if [ -z $excludeddirs ]
+    then 
+      find $backupdirs -type $type -printf "$findformat"
+    else
+      regex=`echo $excludedirs | sed -e 's/ /.*\\\\|/g'`
+      regex=`echo "'\($regex.*\)'"`
+      find $backupdirs -type $type -o -regex $regex -prune -o -printf "$findformat"
+    fi
   done
 } > $currentfiles
 
-echo "Determining list of files to backup with lsbackups"
+echo "-> Determining list of files to backup with lsbackups"
 {
   # lsbackups expects the current date followed by a null before the list of files
   printf "$today\0"
   cat $currentfiles
 } | lsbackups > $backups 2>$statusfile
 
-echo "Running rsync to pack the image"
+echo "-> Running rsync to pack the image"
 rsyncopts="-W -H -S -l -p -t -g -o -0 --files-from=- --stats --progress"
 cat $backups | rsync $rsyncopts / $isomountdir
+if [ $? != 0 ]
+then
+  umount $isomountdir
+  rm -rf $isomountdir $isoimage
+  err "Unable to rsync to pack the image"
+fi
 
-echo "Copying over database and status file"
+echo "-> Copying over database and status file"
 cp $statusfile $backupdb $restorescript $isomountdir
 
-echo "Unmounting image"
+[ $? != 0 ] && err "Unable to copy the database and status file"
+
+echo "-> Unmounting image"
 umount $isomountdir
 
-echo "Calculating md5sum for image"
+[ $? != 0 ] && err "Unable to unmount the iso dir: $isomountdir"
+
+echo "-> Calculating md5sum for image"
 md5sum $isoimage | awk '{print$1}' > $isoimage.md5sum
 
+[ $? != 0 ] && err "Unable to calculate the md5sum for this image: $isoimage"
+
 cat $statusfile | mailx -s "DVD image available to burn - $today" $mailto
 
 echo $today > $lastbackupfile
+
+