Merge up to alan's release

[backups/.git] / scripts / pack-image.sh

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index 9a06f718bfb72a24ea7fbe691de98b40a36fa6bd..fd1e8bca7677047ffff82a2820e17a6c77d0632d 100755 (executable)
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -10,9 +10,14 @@ export PATH=$scriptsdir:/bin:/usr/bin:/sbin:/usr/sbin
 # source the system specific configuration
 [ -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"
 
@@ -29,11 +34,11 @@ then
 fi
 
 echo "-> Creating the iso image in $isoimage"
-dd of=$isoimage bs=1M count=0 seek=4440
+dd of=$isoimage bs=1M count=0 seek=$imagesizemb
 
 [ $? != 0 ] && err "dd failed to create $isoimage"
 
-mke2fs -b 2048 -F $isoimage
+mke2fs -b $blocksize -F $isoimage
 
 if [ $? != 0 ]
 then
@@ -41,6 +46,14 @@ then
   err "Unable to create the iso image: $isoimage"
 fi
 
+e2label $isoimage $today
+
+if [ $? != 0 ]
+then
+  rm -rf $isomountdir $isoimage
+  err "Unable to label the iso image: $isoimage"
+fi
+
 echo "-> Mounting the iso image"
 mount -t ext2 -o loop $isoimage $isomountdir
 if [ $? != 0 ]
@@ -57,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"
 {
@@ -75,20 +92,31 @@ 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
+  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
+cp $backupdbout $isomountdir/$(basename $backupdbin)
+[ $? != 0 ] && err "Unable to copy the database to $isomountdir"
 
-[ $? != 0 ] && err "Unable to copy the database and status file"
+cp $statusfile $restorescript $isomountdir
+[ $? != 0 ] && err "Unable to copy the status file to $isomountdir"
 
 echo "-> Unmounting image"
 umount $isomountdir
@@ -104,4 +132,8 @@ 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" 
+