summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2006-03-31 21:36:17 +0000
committerscottl <scottl@FreeBSD.org>2006-03-31 21:36:17 +0000
commit9b1a80ce37c18c7ae9caed3735a03966def231f9 (patch)
tree6769496ed52648a2857f6a46bef95432dc951483 /sys/boot
parentbce2a6b523e4a6e4e685c1d531544efed2e15479 (diff)
downloadFreeBSD-src-9b1a80ce37c18c7ae9caed3735a03966def231f9.zip
FreeBSD-src-9b1a80ce37c18c7ae9caed3735a03966def231f9.tar.gz
Remove the USB keyboard hack now that KBDMUX is enabled by default. Allow
it to be disabled if Safe Mode is selected.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/forth/beastie.4th12
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index fba284e..c726875 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -40,7 +40,6 @@ variable promptwidth
variable bootkey
variable bootacpikey
-variable bootusbkey
variable bootsafekey
variable bootverbosekey
variable bootsinglekey
@@ -196,12 +195,6 @@ at-xy ." `--{__________) "
printmenuitem ." Boot FreeBSD in single user mode" bootsinglekey !
printmenuitem ." Boot FreeBSD with verbose logging" bootverbosekey !
printmenuitem ." Escape to loader prompt" escapekey !
- s" arch-i386" environment? if
- drop
- printmenuitem ." Boot FreeBSD with USB keyboard" bootusbkey !
- else
- -2 bootusbkey !
- then
printmenuitem ." Reboot" rebootkey !
menuX @ 20 at-xy
." Select option, [Enter] for default"
@@ -267,10 +260,6 @@ set-current
then
0 boot
then
- dup bootusbkey @ = if
- s" 0x1" s" hint.atkbd.0.flags" setenv
- 0 boot
- then
dup bootsafekey @ = if
s" arch-i386" environment? if
drop
@@ -283,6 +272,7 @@ set-current
s" 0" s" hw.ata.atapi_dma" setenv
s" 0" s" hw.ata.wc" setenv
s" 0" s" hw.eisa_slots" setenv
+ s" 1" s" hint.kbdmux.0.disabled" setenv
0 boot
then
dup bootverbosekey @ = if
OpenPOWER on IntegriCloud