X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=scripts%2Fdrive.sh;h=2b758b183045dfbd7aa10dd04ce4664b44126976;hb=bcf38602d9692756e18c485a243686b50144b5ab;hp=1693212a8c5b422e9b229b2e9583b73beed1df78;hpb=b7347b04b24941f3b0a52471daa72597d1ed4645;p=backups%2F.git

diff --git a/scripts/drive.sh b/scripts/drive.sh
index 1693212..2b758b1 100755
--- a/scripts/drive.sh
+++ b/scripts/drive.sh
@@ -1,27 +1,28 @@
 #!/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"
+backupdirs="/home /etc /var/backups /var/lib/debfoster /var/lib/mailman /var/lib/iptables /var/lib/dpkg"
 tmpdir="/dev/shm/backups"
 currentfiles="$tmpdir/files.db"
 backupdb="$datadir/backups.db"
 backups="$tmpdir/backup-list.db"
 statusfile="$tmpdir/backup-status.txt"
 isomountdir="/backup/iso-mount"
-isoimage="/backup/iso-mount.iso"
+isoimage="/backup/ISOs/$today.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/null of=$isoimage bs=2048k count=0 seek=2220
+dd if=/dev/null of=$isoimage bs=1M count=0 seek=4440
 mke2fs -b 2048 -F $isoimage
 
 echo "Mounting the iso image"
@@ -34,7 +35,12 @@ 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 $backupdirs -type $type -printf "$findformat"
+  done
+} > $currentfiles
 
 echo "Determining list of files to backup with lsbackups"
 {
@@ -44,13 +50,20 @@ echo "Determining list of files to backup with lsbackups"
 } | 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
 
+mount -o remount -o ro $isomountdir
+# Should be
 # umount $isomountdir
 
+md5sum $isoimage > $isoimage.md5sum
+
 # Burn the iso image
 # dvdrecord [-dummy] [-overburn] -dao speed=8 dev=[ATAPI:]?,?,? iso-image.iso
+
+# Email me
 cat $statusfile | mailx -s "DVD Image available on ball, burn it!" carl@ecbaldwin.net