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
This commit is contained in:
parent
80611144e4
commit
6ebe96017d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=117939
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user