aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>2000-06-04 04:41:41 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>2000-06-04 04:41:41 +0000
commitce51a9fcf96aa7017956326f7b3159fc85200e02 (patch)
tree930729a5be043ab64199e64d7370f20656cd0d9b /release/Makefile
parent7cadc2663e77373c6aa646c06f75cb7705329842 (diff)
downloadsrc-ce51a9fcf96aa7017956326f7b3159fc85200e02.tar.gz
src-ce51a9fcf96aa7017956326f7b3159fc85200e02.zip
Add a new release variable, AUTO_KEYBOARD_DETECT. If you set it to
1, the -P flag is used on the boot floppies. If not, don't. The new default is to not use it.
Notes
Notes: svn path=/head/; revision=61236
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index f1ed9b3089ac..d3c119e61f65 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -58,6 +58,10 @@ ALLLANG?= yes
DOCPORTS= textproc/docproj
# Set this to wherever the distfiles required by ${DOCPORTS} live.
DOCDISTFILES?= ${.CURDIR}/../../ports/distfiles
+# Set this to 1 if you want -P to be used for automatic keyboard detection
+# on the boot floppy. WARNING: Breaks on some Athlon (K7) motherboards.
+AUTO_KEYBOARD_DETECT?= 0
+
DIST_DOCS= ABOUT.TXT ERRATA.TXT LAYOUT.TXT README.TXT HARDWARE.TXT \
RELNOTES.TXT TROUBLE.TXT UPGRADE.TXT INSTALL.TXT
@@ -771,7 +775,7 @@ doMFSKERN:
@echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
@echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
@touch ${RD}/image.${FSIMAGE}/boot/loader.config
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}
@echo "-P" >> ${RD}/image.${FSIMAGE}/boot.config
.endif
.if defined(BIGBOOT)