Added support for new excludedir configuration option.

Added some simple error detection and cleanup.
Added support to properly exclude files from find cmd.

diff --git a/scripts/config.sh b/scripts/config.sh
index 056bb2c39e8bebd463ba02c68896c578ee07b311..bfe1847b407f1212c734586bbf727c2c2cd8d0b0 100755 (executable)
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -23,3 +23,7 @@ backupdirs="
 /var/lib/iptables
 /var/lib/mailman
 "
+
+excludedirs="
+"
+

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index 9dcc6bf4191a9d16f54452d32b5132ebf36d91b5..f2aae3ee1d9b97a0d2f229a781ed8e0a304163a8 100755 (executable)
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -19,44 +19,101 @@ 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
-
-echo "Creating the iso image in $isoimage"
+if [ $? != 0 ] 
+then
+  if test -d $isomountdir
+  then
+    rm -rf $isomountdir
+  fi
+  echo "-E- Unable to create the following directories: "
+  echo "    $datadir $imagedir $isomountdir $tmpdir"
+  exit -1
+fi
+
+echo "-> Creating the iso image in $isoimage"
 dd if=/dev/null of=$isoimage bs=1M count=0 seek=4440
 mke2fs -b 2048 -F $isoimage
+if [ $? != 0 ]
+then
+  rm -rf $isomountdir $isoimage
+  echo "-E- Unable to create the iso image: $isoimage"
+  exit -1
+fi
 
-echo "Mounting the iso image"
+echo "-> Mounting the iso image"
 mount -t ext2 -o loop $isoimage $isomountdir
+if [ $? != 0 ]
+then
+  rm -rf $isomountdir $isoimage
+  echo "-E- Unable to mount the iso image: $isoimage -> $isomountdir"
+  exit -1
+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
+  echo "-E- Unable to rsync to pack the image"
+  exit -1
+fi
 
-echo "Copying over database and status file"
+echo "-> Copying over database and status file"
 cp $statusfile $backupdb $restorescript $isomountdir
+if [ $? != 0 ]
+then
+  echo "-E- Unable to copy the database and status file"
+  exit -1
+fi
 
-echo "Unmounting image"
+echo "-> Unmounting image"
 umount $isomountdir
+if [ $? != 0 ]
+then
+  echo "-E- Unable to unmount the iso dir: $isomountdir"
+  exit -1
+fi
 
-echo "Calculating md5sum for image"
+echo "-> Calculating md5sum for image"
 md5sum $isoimage | awk '{print$1}' > $isoimage.md5sum
+if [ $? != 0 ]
+then
+  echo "-E- Unable to calculatethe md5sum for this image: $isoimage"
+  exit -1
+fi
 
 cat $statusfile | mailx -s "DVD image available to burn - $today" $mailto
 
 echo $today > $lastbackupfile
+
+