From: micah <micah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Fri, 25 Jul 2008 20:11:24 +0000 (+0000)
Subject: update makecd handler to work with new toolset
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=bf19c79477e1d4bd0f457ce98d02e9fd61bd06fd;p=matthijs%2Fupstream%2Fbackupninja.git

update makecd handler to work with new toolset

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@613 758a04ac-41e6-0310-8a23-8373a73cc35d
---

diff --git a/ChangeLog b/ChangeLog
index c30a282..195bbab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,8 @@ version 0.9.6 -- July 21, 2008
 	trac:
 	 . stop failing on all the trac backups if just one fails, this means
 	   removing the temporary trac backup directories if they fail
+	makecd
+	 . updated handler for new toolset (genisoimage and wodim)
 
 version 0.9.5 -- December 2, 2007
     backupninja changes
diff --git a/handlers/makecd.in b/handlers/makecd.in
index cdfa6b1..1a95d6d 100644
--- a/handlers/makecd.in
+++ b/handlers/makecd.in
@@ -13,10 +13,9 @@ getconf device
 getconf nicelevel 0
 
 # define needed executables:
-MKISOFS="/usr/bin/mkisofs"
+MKISOFS="/usr/bin/genisoimage"
 GROWISOFS="/usr/bin/growisofs"
-#CDRECORD="/usr/bin/cdrecord"
-CDRECORD="/usr/bin/cdrecord.mmap"
+CDRECORD="/usr/bin/wodim"
 CDRDAO="/usr/bin/cdrdao"
 DVDINFO="/usr/bin/dvd+rw-mediainfo"
 
@@ -26,10 +25,10 @@ DVDINFO="/usr/bin/dvd+rw-mediainfo"
 [ -d $backupdir ] || fatal "Backup directory '$backupdir'"
 [ -e "$target" ]  || fatal "target does not exist "
 
-[ -x "$MKISOFS" ]   || debug 3 "echo executable mkisofs not present"
-[ -x "$GROWISOFS" ] || debug 3 "echo executable growisofs not present"
-[ -x "$CDRECORD" ]  || debug 3 "echo executable cdrecord not present"
-[ -x "$CDRDAO" ]    || debug 3 "echo executable cdrdao not present"
+[ -x "$MKISOFS" ]   || debug 3 "echo executable $MKISOFS not present"
+[ -x "$GROWISOFS" ] || debug 3 "echo executable $GROWISOFS not present"
+[ -x "$CDRECORD" ]  || debug 3 "echo executable $CDRECORD not present"
+[ -x "$CDRDAO" ]    || debug 3 "echo executable $CDRDAO not present"
 
 if [ "$isoonly" == "no" ]; then
 	[ -e $device ] || fatal "No Burner device available"
@@ -86,3 +85,4 @@ if [ "$isoonly" == "no" ]; then
 	fi
 fi
 return 0
+