Fix a bug that broke backups for Carl

[backups/.git] / scripts / burn-imgs.sh

diff --git a/scripts/burn-imgs.sh b/scripts/burn-imgs.sh
index b4d71bf807219ff3189e41894780f1a971d6a9d7..a1a6483b3403d70b1b7394e45b94c8969c681837 100755 (executable)
--- a/scripts/burn-imgs.sh
+++ b/scripts/burn-imgs.sh
@@ -3,29 +3,28 @@
 export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 
 cronstopstart="/etc/init.d/cron"
+
+# source the default configuration
 . config.sh
 
+# source the system specific configuration
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
+
 # If the noburn file is there then don't burn.
 [ -f "$noburnfile" ] && exit 0
 
-# Discover disk images by looking for .img.md5sum files in $imagedir
-imgmd5=$(ls $imagedir/*.img.md5sum 2>/dev/null | head -n 1)
+# Discover disk images by looking for .iso.md5sum files in $imagedir
+imgmd5=$(ls $imagedir/*.iso.md5sum 2>/dev/null | head -n 1)
 
 # If we didn't find an non-empty file then exit gracefully
 [ -z "$imgmd5" ] && exit 0
 [ -s "$imgmd5" ] || exit 0
 
-echo MD5 file: $imgmd5
-
 logfile=$(tempfile)
 
-echo Logfile: $logfile
-
 # Get the name of the disk image by stripping off the tailing '.md5sum'
 img=${imgmd5%.md5sum}
 
-echo Image: $img
-
 touch $noburnfile
 
 # A little paranoia.  Make sure the disk image file is there.
@@ -48,10 +47,12 @@ fi
 renice 0 $$
 $cronstopstart start
 
+# I don't know if this *really* helps but give cdrecord a chance to clean up.
+sleep 60
+
 # Now verify the disk by running md5sum on the entire contents of the disk
 md5sum=$(tempfile)
-echo Md5sum: $md5sum
-dd if=$dev bs=1M count=4440 2>$logfile | md5sum | awk '{print$1}' > $md5sum
+dd if=$dev bs=1M count=4440 2>>$logfile | md5sum | awk '{print$1}' > $md5sum
 
 # Check that the md5sums match
 if ! cmp $md5sum $img.md5sum; then
@@ -72,7 +73,7 @@ date >> $img.stat
   cat $img.stat
   echo
   cat $logfile
-} | mailx -s "DVD burned.  File as ${img%.*}" $mailto > $logfile 2>&1
+} | mailx -s "DVD burned.  File as $(basename ${img%.*})" $mailto > $logfile 2>&1
 
 # Two lines in the stat file indicate two successful burns.  Clean-up the image.
 if [ "$(wc -l $img.stat 2>/dev/null | awk '{print$1}')" == "2" ]; then