X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=scripts%2Fpack-image.sh;h=fd1e8bca7677047ffff82a2820e17a6c77d0632d;hb=30e31c8d36fd4b0e12ab99fdcba347089000b0a7;hp=f2aae3ee1d9b97a0d2f229a781ed8e0a304163a8;hpb=60432b45d7b084c6264e99233c49d99bc9cc52d8;p=backups%2F.git

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index f2aae3e..fd1e8bc 100755
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -8,14 +8,16 @@ export PATH=$scriptsdir:/bin:/usr/bin:/sbin:/usr/sbin
 . config.sh
 
 # source the system specific configuration
-if [ -f /etc/lsbackups.conf ]
-then
-  . /etc/lsbackups.conf
-fi 
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
+
+# process command line arguments
+case "$1" in 
+  -s) simulate=1;;
+esac
 
 # file locations and other values
 today=$(date +%Y%m%d%H%M%S)
-isoimage="$imagedir/$today.img"
+isoimage="$imagedir/$today.iso"
 isomountdir="$isoimage.mnt"
 restorescript="$scriptsdir/restore.sh"
 
@@ -27,19 +29,29 @@ then
   then
     rm -rf $isomountdir
   fi
-  echo "-E- Unable to create the following directories: "
-  echo "    $datadir $imagedir $isomountdir $tmpdir"
-  exit -1
+  err "Unable to create the following directories:
+  $datadir $imagedir $isomountdir $tmpdir"
 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
+dd of=$isoimage bs=1M count=0 seek=$imagesizemb
+
+[ $? != 0 ] && err "dd failed to create $isoimage"
+
+mke2fs -b $blocksize -F $isoimage
+
+if [ $? != 0 ]
+then
+  rm -rf $isomountdir $isoimage
+  err "Unable to create the iso image: $isoimage"
+fi
+
+e2label $isoimage $today
+
 if [ $? != 0 ]
 then
   rm -rf $isomountdir $isoimage
-  echo "-E- Unable to create the iso image: $isoimage"
-  exit -1
+  err "Unable to label the iso image: $isoimage"
 fi
 
 echo "-> Mounting the iso image"
@@ -47,8 +59,7 @@ 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
+  err "Unable to mount the iso image: $isoimage -> $isomountdir"
 fi
 
 echo "-> Directories being backedup and excluded:"
@@ -59,16 +70,20 @@ 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"
-    if [ -z $excludeddirs ]
+    if [ -z "$excludedirs" ]
     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"
+      echo $excludedirs | sed -e 's/ /\n/g' > $tmpdir/excluded
+      find $backupdirs -type $type -printf "$findformat" | grep -z -v -f $tmpdir/excluded
     fi
   done
-} > $currentfiles
+} > $currentfiles 
+
+if [ ! -z $simulate ]
+then
+  backupdbin=$backupdbout
+fi
 
 echo "-> Determining list of files to backup with lsbackups"
 {
@@ -77,43 +92,48 @@ echo "-> Determining list of files to backup with lsbackups"
   cat $currentfiles
 } | lsbackups > $backups 2>$statusfile
 
+if [ ! -z $simulate ]
+then
+   umount $isomountdir
+   rm -rf $isomountdir $isoimage
+   cat $statusfile
+   echo "-> Simulated backup complete! Backup database: $backupdbout"
+   exit;
+fi
+
 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
+  rm -rf $isomountdir $isoimage $backupdbout
+  err "Unable to rsync to pack the image"
 fi
 
 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
+cp $backupdbout $isomountdir/$(basename $backupdbin)
+[ $? != 0 ] && err "Unable to copy the database to $isomountdir"
+
+cp $statusfile $restorescript $isomountdir
+[ $? != 0 ] && err "Unable to copy the status file to $isomountdir"
 
 echo "-> Unmounting image"
 umount $isomountdir
-if [ $? != 0 ]
-then
-  echo "-E- Unable to unmount the iso dir: $isomountdir"
-  exit -1
-fi
+
+[ $? != 0 ] && err "Unable to unmount the iso dir: $isomountdir"
 
 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
+
+[ $? != 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
 
+echo "-> Moving new database to $backupdbin"
+mv $backupdbout $backupdbin
+[ $? != 0 ] && err "Unable to move backupdb: $backupdbout to $backupdbin" 
+