X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=scripts%2Fpack-image.sh;h=67f2054a68d686259c66ea492bde4762794aee83;hb=f43bf03174407b5fe6e9fb85d23480613fa3e1e4;hp=fd1e8bca7677047ffff82a2820e17a6c77d0632d;hpb=d12ec198eaa98cbe9416593f145142a178daeffd;p=backups%2F.git

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index fd1e8bc..67f2054 100755
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -10,8 +10,9 @@ export PATH=$scriptsdir:/bin:/usr/bin:/sbin:/usr/sbin
 # source the system specific configuration
 [ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 
+simulate=
 # process command line arguments
-case "$1" in 
+case "$1" in
   -s) simulate=1;;
 esac
 
@@ -21,14 +22,15 @@ isoimage="$imagedir/$today.iso"
 isomountdir="$isoimage.mnt"
 restorescript="$scriptsdir/restore.sh"
 
+echo "-> Checking for available disk space on $imagedir"
+available=$(df $imagedir | awk '{print$4}' | grep -E "[0-9]+")
+required=$((imagesizemb*1024))
+[ $required -gt $available ] && err "Not enough space for the backup image on $imagedir"
+
 echo "-> Creating directories"
 mkdir --mode=700 -p $datadir $imagedir $isomountdir $tmpdir
-if [ $? != 0 ] 
-then
-  if test -d $isomountdir
-  then
-    rm -rf $isomountdir
-  fi
+if [ $? != 0 ]; then
+  test -d $isomountdir && rm -rf $isomountdir
   err "Unable to create the following directories:
   $datadir $imagedir $isomountdir $tmpdir"
 fi
@@ -39,25 +41,20 @@ dd of=$isoimage bs=1M count=0 seek=$imagesizemb
 [ $? != 0 ] && err "dd failed to create $isoimage"
 
 mke2fs -b $blocksize -F $isoimage
-
-if [ $? != 0 ]
-then
+if [ $? != 0 ]; then
   rm -rf $isomountdir $isoimage
   err "Unable to create the iso image: $isoimage"
 fi
 
 e2label $isoimage $today
-
-if [ $? != 0 ]
-then
+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 ]
-then
+if [ $? != 0 ]; then
   rm -rf $isomountdir $isoimage
   err "Unable to mount the iso image: $isoimage -> $isomountdir"
 fi
@@ -69,19 +66,17 @@ echo "excludedirs: $excludedirs"
 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 "$excludedirs" ]
-    then 
+    findformat="$type %#m %u %g %s %TY%Tm%Td%TH%TM%TS 0 %p\0"
+    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 
+} > $currentfiles
 
-if [ ! -z $simulate ]
-then
+if [ -n "$simulate" ]; then
   backupdbin=$backupdbout
 fi
 
@@ -92,8 +87,7 @@ echo "-> Determining list of files to backup with lsbackups"
   cat $currentfiles
 } | lsbackups > $backups 2>$statusfile
 
-if [ ! -z $simulate ]
-then
+if [ -n "$simulate" ]; then
    umount $isomountdir
    rm -rf $isomountdir $isoimage
    cat $statusfile
@@ -104,8 +98,7 @@ 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
+if [ $? != 0 ]; then
   umount $isomountdir
   rm -rf $isomountdir $isoimage $backupdbout
   err "Unable to rsync to pack the image"
@@ -127,6 +120,8 @@ echo "-> Calculating md5sum for image"
 md5sum $isoimage | awk '{print$1}' > $isoimage.md5sum
 
 [ $? != 0 ] && err "Unable to calculate the md5sum for this image: $isoimage"
+[ -z "$isoimage.md5sum" ] && err "Unable to calculate the md5sum for this image: $isoimage"
+[ -s "$isoimage.md5sum" ] || err "Unable to calculate the md5sum for this image: $isoimage"
 
 cat $statusfile | mailx -s "DVD image available to burn - $today" $mailto
 
@@ -134,6 +129,5 @@ echo $today > $lastbackupfile
 
 echo "-> Moving new database to $backupdbin"
 mv $backupdbout $backupdbin
-[ $? != 0 ] && err "Unable to move backupdb: $backupdbout to $backupdbin" 
-
+[ $? != 0 ] && err "Unable to move backupdb: $backupdbout to $backupdbin"