[Fai-commit] r6423 - in branches/stable/3.4: bin man

[Michael Prokop]

Author: mika
Date: 2011-04-15 17:46:29 +0000 (Fri, 15 Apr 2011)
New Revision: 6423

Modified:
   branches/stable/3.4/bin/fai-cd
   branches/stable/3.4/man/fai-cd.8
Log:
use new command names for cdrecord and mkisofs (closes: #609568)

cdrecord -> wodim, mkisofs -> genisoimage

(cherry picked from commit da407b151cc349285be88ea1018ebaea50ae4fd2)

Modified: branches/stable/3.4/bin/fai-cd
===================================================================
--- branches/stable/3.4/bin/fai-cd	2011-04-15 17:46:25 UTC (rev 6422)
+++ branches/stable/3.4/bin/fai-cd	2011-04-15 17:46:29 UTC (rev 6423)
@@ -6,7 +6,7 @@
 # fai-cd -- make a fai CD, a bootable CD that performs the FAI
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2004-2010 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2004-2011 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 # Support for grub2 added by Sebastian Hetze, s.hetze at linux-ag.de
 # with major support from Michael Prokop, prokop at grml-solutions.com
@@ -51,7 +51,7 @@
 usage() {
 
     cat <<-EOF
-	fai-cd Copyright (C) 2004-2010 Thomas Lange
+	fai-cd Copyright (C) 2004-2011 Thomas Lange
 
 	Usage: fai-cd [OPTIONS] -m MIRRORDIR ISONAME
 	Usage: fai-cd [OPTIONS] -B ISONAME
@@ -236,7 +236,7 @@
     [ $makeiso -eq 0 ] && return
 
     echo "Writing FAI CD-ROM image to $isoname. This may need some time."
-    mkisofs --iso-level 4 -V "$vname" -A "$aname" -log-file /dev/null -quiet -l -r -J -b "$boot_image" -no-emul-boot -boot-load-size 4 -boot-info-table -o $isoname $tmp || die 12 "mkisofs failed." 
+    genisoimage --iso-level 4 -V "$vname" -A "$aname" -log-file /dev/null -quiet -l -r -J -b "$boot_image" -no-emul-boot -boot-load-size 4 -boot-info-table -o $isoname $tmp || die 12 "genisoimage failed." 
     echo -n "ISO image size and filename: "; du -h $isoname
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -338,7 +338,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - -
 burniso() {
 
-    cdrecord -v -eject $isoname
+    wodim -v -eject $isoname
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - -
 # main program
@@ -386,7 +386,7 @@
 [ "$grub_version" -eq 1 ] || [ "$grub_version" -eq 2 ] || die 20 "grub version -G must be either 1 or 2."
 
 if [ $makeiso -eq 1 ]; then
-    [ -x "$(which mkisofs)" ] || die 8 "mkisofs not found. Please install package."
+    [ -x "$(which genisoimage)" ] || die 8 "genisoimage not found. Please install package."
 fi
 
 # use FAI_ETC_DIR from environment variable

Modified: branches/stable/3.4/man/fai-cd.8
===================================================================
--- branches/stable/3.4/man/fai-cd.8	2011-04-15 17:46:25 UTC (rev 6422)
+++ branches/stable/3.4/man/fai-cd.8	2011-04-15 17:46:29 UTC (rev 6423)
@@ -62,7 +62,8 @@
 used as boot menu configuration.
 .TP
 .BI \-b
-After creating the ISO image burn it by calling cdrecord(1).
+After creating the ISO image burn it by calling wodim(1) (a version of
+cdrecord).
 .TP
 .B \-C CFDIR
 Use CFDIR as the configuration directory. Default is /etc/fai. You can
@@ -106,7 +107,7 @@
 Use DIRECTORY as partial FAI mirror. This option is mandatory.
 .TP
 .BI \-n
-No ISO image. Do not call mkisofs to create the ISO image. This is for
+No ISO image. Do not call genisoimage to create the ISO image. This is for
 creating the filesystem only. Useful for writing it to a USB stick.
 .TP
 .BI "\-u " DIRECTORY