Rename drive.sh to pack-image.sh

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ba618aaa3f466883c1274f3456f9e7a3f200bb42..852a3c049657bd96fc03ed41cbbebc4b43d55ee2 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,5 +1,5 @@
 bin_SCRIPTS = \
-       drive.sh \
+       pack-image.sh \
        files-from-date.sh \
        list-dates.sh \
        restore-script.sh \

diff --git a/scripts/drive.sh b/scripts/drive.sh
deleted file mode 100755 (executable)
index 92afa19..0000000
--- a/scripts/drive.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-scriptsdir=$(dirname $0)
-
-export PATH=$scriptsdir:$PATH
-
-# file locations and other values
-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/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"
-imagedir="/backup/imgs"
-isoimage="$imagedir/$today.img"
-isomountdir="$isoimage.mnt"
-restorescript="$scriptsdir/restore.sh"
-
-echo "Creating directories"
-mkdir --mode=700 -p $datadir $imagedir $isomountdir $tmpdir
-
-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 -t ext2 -o loop $isoimage $isomountdir
-
-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 $backupdirs -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"
-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 $restorescript $isomountdir
-
-echo "Unmounting image"
-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=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
-  fi
-else
-  echo "Failed" | mailx -s "DVD burning failed!!!" $mailto
-  exit 1
-fi
-
-# Email me
-cat $statusfile | mailx -s "DVD burned.  File it as $today" $mailto

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
new file mode 100755 (executable)
index 0000000..92afa19
--- /dev/null
+++ b/scripts/pack-image.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+scriptsdir=$(dirname $0)
+
+export PATH=$scriptsdir:$PATH
+
+# file locations and other values
+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/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"
+imagedir="/backup/imgs"
+isoimage="$imagedir/$today.img"
+isomountdir="$isoimage.mnt"
+restorescript="$scriptsdir/restore.sh"
+
+echo "Creating directories"
+mkdir --mode=700 -p $datadir $imagedir $isomountdir $tmpdir
+
+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 -t ext2 -o loop $isoimage $isomountdir
+
+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 $backupdirs -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"
+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 $restorescript $isomountdir
+
+echo "Unmounting image"
+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=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
+  fi
+else
+  echo "Failed" | mailx -s "DVD burning failed!!!" $mailto
+  exit 1
+fi
+
+# Email me
+cat $statusfile | mailx -s "DVD burned.  File it as $today" $mailto