X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=scripts%2Fdrive.sh;h=dbe6b0b7e074349605af6124c4479e5b05a47ad0;hb=6bf84dfd36b859d1bb2cf43f2fc998eee3fd65cc;hp=6ea91a6bae84a8f21f89a4ec6221cd7ba57a27a5;hpb=109d5e46a35ba3c1790fe5bbcd37b920f48b09cd;p=backups%2F.git

diff --git a/scripts/drive.sh b/scripts/drive.sh
index 6ea91a6..dbe6b0b 100755
--- a/scripts/drive.sh
+++ b/scripts/drive.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 scriptsdir=$(dirname $0)
-bindir="$scriptsdir/../build"
 
-export PATH=$scriptsdir:$bindir:$PATH
+export PATH=$scriptsdir:$PATH
 
 # file locations and other values
+today=$(date +%Y%m%d%H%M%S)
 datadir="/var/lib/backups"
 tmpdir="/dev/shm/backups"
 currentfiles="$tmpdir/files.db"
@@ -14,13 +14,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"
@@ -33,16 +34,26 @@ chmod 700 $tmpdir
 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"
-cat $currentfiles | lsbackups > $backups 2>$statusfile
+{
+  # 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"
-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