From ede3109ce85b9a29cc602b9f2c47843d981ed04f Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 5 Sep 2008 21:28:27 -0700
Subject: [PATCH] --- yaml --- r: 113379 b: refs/heads/master c:
 d2f37384fc9957ad0162d5285a5660f0a86ef243 h: refs/heads/master i:   113377:
 a8c8c670b2e1ec9be3cfbec4c6b354a2c0bcafaf   113375:
 e6b9f64aa67b78443af58370330b151f060cb663 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/boot/Makefile | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index df0bbd14c063..6d3623fd9df7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f16a339787d45f997d67c1a4dea3c357f48e121
+refs/heads/master: d2f37384fc9957ad0162d5285a5660f0a86ef243
diff --git a/trunk/arch/x86/boot/Makefile b/trunk/arch/x86/boot/Makefile
index 7ee102f9c4f8..cceba1f46365 100644
--- a/trunk/arch/x86/boot/Makefile
+++ b/trunk/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)