xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2025-02-02 20:11:48 +00:00
Code Issues Projects Releases Wiki Activity

[util] Detect genisoimage as mkisofs replacement

Browse Source 
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>
This commit is contained in:
Stefan Hajnoczi 2010-02-13 17:00:42 +00:00 committed by Marty Connor
parent 5e70e856ff
commit f9f7863c55
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/geniso
View File

@ -13,6 +13,7 @@ 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 ]
@ -20,6 +21,15 @@ 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`
@ -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