diff options
| author | qz150045 <none@none> | 2006-12-14 22:26:34 -0800 |
|---|---|---|
| committer | qz150045 <none@none> | 2006-12-14 22:26:34 -0800 |
| commit | fe539fb313fcf38628fdaadef98c79a8c5beee37 (patch) | |
| tree | 51563a4703238ce10ac5096fe315a76f6fe346f1 | |
| parent | b3001def2a41995242feff3e584ad9ead06d7b1b (diff) | |
| download | illumos-joyent-fe539fb313fcf38628fdaadef98c79a8c5beee37.tar.gz | |
6493870 eeprom var 'kbd-type' is obsolete in FWARC 2006/224
| -rw-r--r-- | usr/src/cmd/loadkeys/set_keyboard_layout | 13 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/bootenv.rc | 9 |
2 files changed, 15 insertions, 7 deletions
diff --git a/usr/src/cmd/loadkeys/set_keyboard_layout b/usr/src/cmd/loadkeys/set_keyboard_layout index e4964808b3..0fc05936e7 100644 --- a/usr/src/cmd/loadkeys/set_keyboard_layout +++ b/usr/src/cmd/loadkeys/set_keyboard_layout @@ -28,11 +28,20 @@ # get the valid layout name from the eeprom and set it into kernel. # check space and tab to make sure that the kbd -s interaction mode # doesn't run here. -KBD_LAYOUT_NAME="`/usr/sbin/eeprom kbd-type |\ - /usr/bin/sed -n 's/kbd-type=//g; s/[ | ]*//p'`" +KBD_LAYOUT_NAME="`/usr/sbin/eeprom keyboard-layout |\ + /usr/bin/sed -n 's/keyboard-layout=//g; s/[ | ]*//p'`" if test -n "$KBD_LAYOUT_NAME" then + KBD_LAYOUT_NAME_STRING="^$KBD_LAYOUT_NAME=" + LAYOUT_NAME_VALID="`cat /usr/share/lib/keytables/type_6/kbd_layouts | \ + grep $KBD_LAYOUT_NAME_STRING`" +else + exit 0 +fi + +if test -n "$LAYOUT_NAME_VALID" +then # Set the keyboard layout /usr/bin/kbd -s $KBD_LAYOUT_NAME fi diff --git a/usr/src/uts/intel/os/bootenv.rc b/usr/src/uts/intel/os/bootenv.rc index c0212adeb2..752e13b15a 100644 --- a/usr/src/uts/intel/os/bootenv.rc +++ b/usr/src/uts/intel/os/bootenv.rc @@ -1,13 +1,12 @@ # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -26,7 +25,7 @@ # # bootenv.rc -- boot "environment variables" # -setprop kbd-type US-English +setprop keyboard-layout Unknown setprop ata-dma-enabled 1 setprop atapi-cd-dma-enabled 1 setprop ttyb-rts-dtr-off false |