From 6ebe96017dc2566a3bdf13aa67c1e56fb0d36e32 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 23 Jul 2003 20:53:37 +0000
Subject: [PATCH] Added the (undocumented) EMUL_BOOT variable (for TARGET=i386
 only) that causes the bootable ISO images to be created using the floppy
 emulation (the old method) as opposed to the new "cdboot" method.

Only copy boot.flp to the 2nd CD-ROM if this variable is defined.

Reviewed by:	murray
---
 release/Makefile            | 8 ++++++--
 release/i386/mkisoimages.sh | 8 +++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index c8f63207302..e26f36ee4f3 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -287,7 +287,11 @@ EXTRAS+= cdrom.1
 .if defined(MAKE_ISOS)
 EXTRAS+= iso.1
 .endif
-.if ${TARGET} != "pc98"
+.if ${TARGET} == "i386" && defined(EMUL_BOOT)
+BOOTABLE="-eb"
+.elif ${TARGET} == "pc98"
+BOOTABLE=
+.else
 BOOTABLE="-b"
 .endif
 .endif
@@ -899,7 +903,7 @@ cdrom.1:
 	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf
 	@cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
 .endif
-.if ${TARGET} == "i386" && !defined(NO_FLOPPIES)
+.if ${TARGET} == "i386" && defined(EMUL_BOOT) && !defined(NO_FLOPPIES)
 	# In case bootable ISO with floppy emulation is desired.
 	@mkdir -p ${CD_DISC2}/floppies
 	@cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies
diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh
index d0918a0cb94..2aedbe9384c 100644
--- a/release/i386/mkisoimages.sh
+++ b/release/i386/mkisoimages.sh
@@ -14,9 +14,9 @@
 #
 # Usage:
 #
-# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
+# mkisoimages.sh [-[e]b] image-label image-name base-bits-dir [extra-bits-dir]
 #
-# Where -b is passed if the ISO image should be made "bootable" by
+# Where -[e]b is passed if the ISO image should be made "bootable" by
 # whatever standards this architecture supports (may be unsupported),
 # image-label is the ISO image label, image-name is the filename of the
 # resulting ISO image, base-bits-dir contains the image contents and
@@ -24,9 +24,11 @@
 # into base-bits-dir as part of making the image.
 
 if [ "x$1" = "x-b" ]; then
-	# This is highly x86-centric and will be used directly below.
 	bootable="-b boot/cdboot -no-emul-boot"
 	shift
+elif [ "x$1" = "x-eb" ]; then
+	bootable="-b floppies/boot.flp -c floppies/boot.catalog"
+	shift
 else
 	bootable=""
 fi