diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-06 06:28:27 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-06 07:11:25 +0200 |
| commit | d2f37384fc9957ad0162d5285a5660f0a86ef243 (patch) | |
| tree | fb46e705c34cadba845b7e2b6408ae07f155bf76 /arch/x86/boot | |
| parent | x86: boot/compressed/Makefile: fix "make clean" (diff) | |
| download | linux-d2f37384fc9957ad0162d5285a5660f0a86ef243.tar.xz linux-d2f37384fc9957ad0162d5285a5660f0a86ef243.zip | |
x86: when building image.iso, use isohybrid if it exists
When building image.iso (make isoimage), use the isohybrid tool if it
exists. isohybrid is a script included with Syslinux 3.72 and higher,
which creates an image that can be booted either as a hard disk
(including removable, e.g. USB disk) or as a CD-ROM.
If isohybrid doesn't exist, then this has no effect.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 7ee102f9c4f8..cceba1f46365 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -181,6 +181,7 @@ isoimage: $(BOOTIMAGE) mkisofs -J -r -o $(obj)/image.iso -b isolinux.bin -c boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ $(obj)/isoimage + isohybrid $(obj)/image.iso 2>/dev/null || true rm -rf $(obj)/isoimage zlilo: $(BOOTIMAGE) |