Testing making changes.

[backups/.git] / scripts / pack-image.sh

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index 92afa19539e1d0c456de66d0d9cb1b2c9b3bc0c0..ec7b1da74e99b2e8a1738eed0190c3f2c6feeb41 100755 (executable)
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -2,19 +2,12 @@
 
 scriptsdir=$(dirname $0)
 
-export PATH=$scriptsdir:$PATH
+export PATH=$scriptsdir:/bin:/usr/bin:/sbin:/usr/sbin
+
+. config.sh
 
 # 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"
@@ -45,7 +38,7 @@ echo "Determining list of files to backup with lsbackups"
 } | lsbackups > $backups 2>$statusfile
 
 echo "Running rsync to pack the image"
-rsyncopts="-l -p -t -g -o -0 --files-from=- --stats --progress"
+rsyncopts="-W -H -S -l -p -t -g -o -0 --files-from=- --stats --progress"
 cat $backups | rsync $rsyncopts / $isomountdir
 
 echo "Copying over database and status file"
@@ -57,21 +50,6 @@ 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
+cat $statusfile | mailx -s "DVD image available to burn - $today" $mailto
 
-# Email me
-cat $statusfile | mailx -s "DVD burned.  File it as $today" $mailto
+echo $today > $lastbackupfile