summaryrefslogtreecommitdiffstats
path: root/src/util
diff options
context:
space:
mode:
authorMichael Brown2011-03-27 23:32:11 +0200
committerMichael Brown2011-03-27 23:37:04 +0200
commitd161ebff94b61ce1bdc0ed6c09f7ba75a1d481b5 (patch)
tree4681dc561a125d77d0dcf3ce01db5113250d31ea /src/util
parent[build] Delete incomplete targets if building fails for any reason (diff)
downloadipxe-d161ebff94b61ce1bdc0ed6c09f7ba75a1d481b5.tar.gz
ipxe-d161ebff94b61ce1bdc0ed6c09f7ba75a1d481b5.tar.xz
ipxe-d161ebff94b61ce1bdc0ed6c09f7ba75a1d481b5.zip
[build] Generate hybrid ISO images if isohybrid is available
Suggested-by: Gene Cumm <gene.cumm@gmail.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/util')
-rwxr-xr-xsrc/util/geniso7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/util/geniso b/src/util/geniso
index 1792fc1c..790e7171 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -30,6 +30,9 @@ then
exit 1
fi
+# isohybrid will be used if available
+isohybrid=`which isohybrid 2>/dev/null`
+
out=$1
shift
dir=`mktemp -d bin/iso.dir.XXXXXX`
@@ -63,3 +66,7 @@ do
done >> $cfg
$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
+if [ -n "$isohybrid" ]
+then
+ $isohybrid $out >/dev/null
+fi