diff options
| -rw-r--r-- | release/Makefile | 6 | ||||
| -rw-r--r-- | release/i386/mkisoimages.sh | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/release/Makefile b/release/Makefile index 6bd9e37..de5359b 100644 --- a/release/Makefile +++ b/release/Makefile @@ -265,9 +265,7 @@ RD= ${_R}/stage RND= ${RD}/release.doc FD= ${_R}/ftp CD= ${_R}/cdrom -.if ${TARGET} != "pc98" CD_BOOT= ${CD}/bootonly -.endif CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 .if defined(SEPARATE_LIVEFS) @@ -308,7 +306,7 @@ EXTRAS+= cdrom.1 cdrom.2 cdrom.3 EXTRAS+= iso.1 .endif .if ${TARGET} == "pc98" -BOOTABLE= +BOOTABLE="-G" .else BOOTABLE="-b" .endif @@ -945,7 +943,6 @@ cdrom.1: @rm -f ${CD_LIVEFS}/.profile @cp ${.CURDIR}/fixit.profile ${CD_LIVEFS}/.profile @ln -sf /rescue ${CD_LIVEFS}/stand -.if ${TARGET} != "pc98" @echo "Setting up CDROM boot area" @rm -f ${CD_LIVEFS}/boot/loader.conf @cp ${RD}/mfsroot/mfsroot.gz ${CD_LIVEFS}/boot/mfsroot.gz @@ -960,7 +957,6 @@ cdrom.1: @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_LIVEFS}/boot/device.hints .endif .endif -.endif @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf touch ${.TARGET} diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh index cd796e5..9bb3dbc 100644 --- a/release/i386/mkisoimages.sh +++ b/release/i386/mkisoimages.sh @@ -28,12 +28,15 @@ 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-G" ]; then + bootable="-G /R/cdrom/bootonly/boot/cdboot" + shift else bootable="" fi if [ $# -lt 3 ]; then - echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' + echo Usage: $0 '[-bG] image-label image-name base-bits-dir [extra-bits-dir]' exit 1 fi |
