I'm lovin' it

diff --git a/scripts/drive.sh b/scripts/drive.sh
index 367016c57c56c00df1d94b6d09c9d1b905530175..92afa19539e1d0c456de66d0d9cb1b2c9b3bc0c0 100755 (executable)
--- a/scripts/drive.sh
+++ b/scripts/drive.sh
@@ -8,33 +8,27 @@ export PATH=$scriptsdir:$PATH
 today=$(date +%Y%m%d%H%M%S)
 mailto='carl@ecbaldwin.net'
 datadir="/var/lib/backups"
-backupdirs="/home /etc /var/backups /var/lib/debfoster /var/lib/mailman /var/lib/iptables /var/lib/dpkg"
+backupdirs="/home /etc /var/backups /var/lib/debfoster /var/lib/mailman /var/lib/iptables /var/lib/ip6tables /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/ISOs/$today.img"
+imagedir="/backup/imgs"
+isoimage="$imagedir/$today.img"
+isomountdir="$isoimage.mnt"
 restorescript="$scriptsdir/restore.sh"
 
-echo "Creating the iso image in $isoimage"
-touch $isoimage
-# chmod 600 $isoimage
+echo "Creating directories"
+mkdir --mode=700 -p $datadir $imagedir $isomountdir $tmpdir
 
-# Create filesystem on iso image here
+echo "Creating the iso image in $isoimage"
 dd if=/dev/null of=$isoimage bs=1M count=0 seek=4440
 mke2fs -b 2048 -F $isoimage
 
 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
@@ -63,11 +57,13 @@ umount $isomountdir
 echo "Calculating md5sum for image"
 md5sum $isoimage | awk '{print$1}' > $isoimage.md5sum
 
+exit 0
+
 # Burn the iso image
 echo "Burn the image to a DVD"
 if cdrecord-wrapper.sh -dao speed=8 dev=ATA:1,0,0 $isoimage; then
   md5sum_file=$(tempfile)
-  dd if=/dev/hdc bs=2048k count=2220 | md5sum | awk '{print$1}' > $md5sum_file
+  dd if=/dev/hdc bs=1M count=4440 | md5sum | awk '{print$1}' > $md5sum_file
   if ! cmp $md5sum_file $isoimage.md5sum; then
     echo "Failed" | mailx -s "DVD md5sum doesn't match image file!!!" $mailto
     exit 1