From 16be165733c3c5613c79c48ab20d7228e0c7b9c4 Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 1 Dec 2004 18:03:18 +0000 Subject: Don't allow ISO images to be made that try to use boot.flp to boot as the boot.flp in 5.3 and later is not self-contained and thus not suitable for CD booting. /boot/cdboot is now the only way to boot the install CDs. MFC after: 2 weeks --- release/i386/mkisoimages.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'release') diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh index b02ca91..96425d5 100644 --- a/release/i386/mkisoimages.sh +++ b/release/i386/mkisoimages.sh @@ -14,9 +14,9 @@ # # Usage: # -# mkisoimages.sh [-[e]b] image-label image-name base-bits-dir [extra-bits-dir] +# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir] # -# Where -[e]b is passed if the ISO image should be made "bootable" by +# Where -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 @@ -28,9 +28,6 @@ publisher="The FreeBSD Project. http://www.freebsd.org/" if [ "x$1" = "x-b" ]; then 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 -- cgit v1.1