Skip to content

Commit

Permalink
[util] Detect genisoimage as mkisofs replacement
Browse files Browse the repository at this point in the history
Debian based systems may have genisoimage(1) instead of mkisofs(1).
They are command-line compatible so the util/geniso script should be
able to choose either one.

This patch also changes the use of the mkisofs quiet (-q) flag to its
long form (-quiet).  This should be compatible with more versions of
cdrtools and cdrkit.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Marty Connor <mdc@etherboot.org>
  • Loading branch information
stefanha authored and Marty Connor committed Feb 13, 2010
1 parent 5e70e85 commit f9f7863
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/util/geniso
Expand Up @@ -13,13 +13,23 @@ case $# in
exit 1
;;
esac

# This should be the default location of the isolinux.bin file
isolinux_bin=${ISOLINUX_BIN:-util/isolinux.bin}
if [ ! -r $isolinux_bin ]
then
echo $0: $isolinux_bin not found, please install, or set ISOLINUX_BIN in arch/i386/Makefile correctly
exit 1
fi

# There should either be mkisofs or the compatible genisoimage program
mkisofs=`which mkisofs genisoimage | head -n1`
if [ -z $mkisofs ]
then
echo $0: mkisofs or genisoimage not found, please install or set PATH
exit 1
fi

out=$1
shift
dir=`mktemp -d bin/iso.dir.XXXXXX`
Expand Down Expand Up @@ -51,5 +61,5 @@ do
echo "" KERNEL $g
cp -p $f $dir/$g
done >> $cfg
mkisofs -q -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
$mkisofs -quiet -l -o $out -c boot.cat -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table $dir
rm -fr $dir

0 comments on commit f9f7863

Please sign in to comment.