mirror of https://github.com/ipxe/ipxe.git
[util] Detect genisoimage as mkisofs replacement
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>pull/1/head
parent
5e70e856ff
commit
f9f7863c55
|
@ -13,6 +13,7 @@ case $# in
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# This should be the default location of the isolinux.bin file
|
# This should be the default location of the isolinux.bin file
|
||||||
isolinux_bin=${ISOLINUX_BIN:-util/isolinux.bin}
|
isolinux_bin=${ISOLINUX_BIN:-util/isolinux.bin}
|
||||||
if [ ! -r $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
|
echo $0: $isolinux_bin not found, please install, or set ISOLINUX_BIN in arch/i386/Makefile correctly
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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
|
out=$1
|
||||||
shift
|
shift
|
||||||
dir=`mktemp -d bin/iso.dir.XXXXXX`
|
dir=`mktemp -d bin/iso.dir.XXXXXX`
|
||||||
|
@ -51,5 +61,5 @@ do
|
||||||
echo "" KERNEL $g
|
echo "" KERNEL $g
|
||||||
cp -p $f $dir/$g
|
cp -p $f $dir/$g
|
||||||
done >> $cfg
|
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
|
rm -fr $dir
|
||||||
|
|
Loading…
Reference in New Issue