X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=scripts%2Fpack-image.sh;h=4f9c8287c1dc009e8e269dbf77bd45ebcfc93cf0;hb=18ca258203f2ef6f669dbcdf687038947eab3791;hp=54706fd1ccb739b3ed78e01d1066fc5624a9efd2;hpb=dcc0124d9ce7b2d6ee2230425e61446f9cc86a2d;p=backups%2F.git

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index 54706fd..4f9c828 100755
--- 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 $excludedirs ]
+    then 
+      find $backupdirs -type $type -printf "$findformat"
+    else
+      echo $excludedirs | sed -e 's/ /\n/g' > $tmpdir/excluded
+      find $backupdirs -type $type -printf "$findformat" | grep -z -v -f $tmpdir/excluded
+    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"
-rsyncopts="-W -H -l -p -t -g -o -0 --files-from=- --stats --progress"
+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 $backupdb.tmp
+  err "Unable to rsync to pack the image"
+fi
 
-echo "Copying over database and status file"
+echo "-> Copying over database and status file"
+mv $backupdb.tmp $backupdb
 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
+
+