X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=scripts%2Fburn-imgs.sh;h=028b3c6e9667f44807fdf9a30168f486cae773ac;hb=c92b2a057cef503a5d2fa29d0372ac3ed054e7a2;hp=f33ea99251242a5a1affdc700c0df307f995d8b7;hpb=1bf84f6a5da2c88def0df3643abe41b11c3b0c89;p=backups%2F.git

diff --git a/scripts/burn-imgs.sh b/scripts/burn-imgs.sh
index f33ea99..028b3c6 100755
--- a/scripts/burn-imgs.sh
+++ b/scripts/burn-imgs.sh
@@ -2,22 +2,17 @@
 
 export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 
-cronstopstart="/etc/init.d/cron"
-
 # source the default configuration
 . config.sh
 
 # source the system specific configuration
-if [ -f /etc/lsbackups.conf ]
-then
-  . /etc/lsbackups.conf
-fi 
+[ -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
@@ -39,10 +34,12 @@ $cronstopstart stop
 renice -10 $$
 
 # Burn the image to a disk.
-cdrecord-wrapper.sh -dao dev=$sdev $img > $logfile 2>&1
+cdrecord-wrapper.sh $cdrecordopts dev=$sdev $img > $logfile 2>&1
 
 if [ "0" != "$?" ]; then
   echo >&2 "cdrecord failed!"
+  $cronstopstart start
+  cat $logfile | grep -v "MB written" | grep -v "to quit" | mailx -s "backups: failed to burn $img!!!" $mailto
   exit 1
 fi
 
@@ -59,7 +56,8 @@ 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
-  echo "Failed" | mailx -s "DVD md5sum doesn't match image file!!!" $mailto
+  echo "md5sum check FAILED" >> $logfile
+  cat $logfile | grep -v "MB written" | grep -v "to quit" | mailx -s "DVD md5sum doesn't match image file!!!" $mailto
   exit 1
 fi
 
@@ -76,10 +74,10 @@ date >> $img.stat
   cat $img.stat
   echo
   cat $logfile
-} | mailx -s "DVD burned.  File as $(basename ${img%.*})" $mailto > $logfile 2>&1
+} | grep -v "MB written" | grep -v "to quit" | 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
+if [ "$(wc -l $img.stat 2>/dev/null | awk '{print$1}')" == "$makeXcopies" ]; then
   # Burned the image twice.  Removing it and associated files!
   rm -f $img{,.md5sum,.stat}
   [ -d $img.mnt ] && rmdir $img.mnt