X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=scripts%2Fdrive.sh;h=4ea1e54d77ef957e0b96617bd2ecfd99f32e0304;hb=11b38584ce4c12e7a83c1cb206fa87141f74de5c;hp=63ac79c5c7c572c2c7ac1d1a134feb8b6338fb44;hpb=57c4edfa25af631f98166dde7ff1ae9c645ca962;p=backups%2F.git

diff --git a/scripts/drive.sh b/scripts/drive.sh
index 63ac79c..4ea1e54 100755
--- a/scripts/drive.sh
+++ b/scripts/drive.sh
@@ -3,29 +3,19 @@
 scriptsdir=$(dirname $0)
 bindir="$scriptsdir/../build"
 
-datadir="/var/lib/backups"
-tmpdir="/dev/shm/backups"
-
-mkdir -p $tmpdir
-chmod 700 $tmpdir
-
 export PATH=$scriptsdir:$bindir:$PATH
 
-files="$tmpdir/files.db"
-touch $files
-chmod 600 $files
-echo "Running find to get the status of files"
-find-cmd.sh /home > $files
-
-db="$datadir/backups.db"
+# 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"
+backupdb="$datadir/backups.db"
 backups="$tmpdir/backup-list.db"
 statusfile="$tmpdir/backup-status.txt"
-
-echo "Determining list of files to backup with lsbackups"
-cat $files | lsbackups > $backups 2>$statusfile
-
 isomountdir="/backup/iso-mount"
 isoimage="/backup/iso-mount.iso"
+restorescript="$scriptsdir/restore.sh"
 
 echo "Creating the iso image in $isoimage"
 touch $isoimage
@@ -39,11 +29,32 @@ echo "Mounting the iso image"
 # Mount iso image here
 mount -t ext2 -o loop $isoimage $isomountdir
 
+mkdir -p $tmpdir
+chmod 700 $tmpdir
+
+touch $currentfiles
+chmod 600 $currentfiles
+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"
+    find /home -type $type -printf "$findformat"
+  done
+} > $currentfiles
+
+echo "Determining list of files to backup with lsbackups"
+{
+  # 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 $db $isomountdir
+cp $statusfile $backupdb $restorescript $isomountdir
 
 # umount $isomountdir