Merge branch 'master' of home:dvl/backup

diff --combined scripts/drive.sh
index 4ea1e54d77ef957e0b96617bd2ecfd99f32e0304,1693212a8c5b422e9b229b2e9583b73beed1df78..0b0268933ac5c18d1e0c80c350870558bdd55cd0
--- 1/scripts/drive.sh
--- 2/scripts/drive.sh
+++ b/scripts/drive.sh
@@@ -15,14 -15,13 +15,14 @@@ backups="$tmpdir/backup-list.db
  statusfile="$tmpdir/backup-status.txt"
  isomountdir="/backup/iso-mount"
  isoimage="/backup/iso-mount.iso"
 +restorescript="$scriptsdir/restore.sh"
  
  echo "Creating the iso image in $isoimage"
  touch $isoimage
  # chmod 600 $isoimage
  
  # Create filesystem on iso image here
- dd if=/dev/zero of=$isoimage bs=2048k count=2220
+ dd if=/dev/null of=$isoimage bs=2048k count=0 seek=2220
  mke2fs -b 2048 -F $isoimage
  
  echo "Mounting the iso image"
@@@ -35,12 -34,7 +35,12 @@@ chmod 700 $tmpdi
  touch $currentfiles
  chmod 600 $currentfiles
  echo "Running find to get the status of files"
 -find-cmd.sh /home > $currentfiles
 +{
 +  for type in d f l; do
 +    findformat="$type %#m %u %g %s %CY%Cm%Cd%CH%CM%CS 0 %p\0"
 +    find /home -type $type -printf "$findformat"
 +  done
 +} > $currentfiles
  
  echo "Determining list of files to backup with lsbackups"
  {
@@@ -50,11 -44,10 +50,11 @@@
  } | lsbackups > $backups 2>$statusfile
  
  echo "Running rsync to pack the image"
 -cat $backups | rsync-cmd.sh $isomountdir
 +rsyncopts="-l -p -t -g -o -0 --files-from=- --stats --progress"
 +cat $backups | rsync $rsyncopts / $isomountdir
  
  echo "Copying over database and status file"
 -cp $statusfile $backupdb $isomountdir
 +cp $statusfile $backupdb $restorescript $isomountdir
  
  # umount $isomountdir