diff options
| author | qz150045 <none@none> | 2007-01-26 16:10:27 -0800 |
|---|---|---|
| committer | qz150045 <none@none> | 2007-01-26 16:10:27 -0800 |
| commit | e4603304e8bd084dd25a0dbafdd438ac250d5f56 (patch) | |
| tree | fec0c4764cc1ae58a0bd7fdc98054c833d447077 /usr/src/cmd/loadkeys | |
| parent | 72bdce51192b13a20009855f749004480874291b (diff) | |
| download | illumos-joyent-e4603304e8bd084dd25a0dbafdd438ac250d5f56.tar.gz | |
6427784 Solaris need be updated to support OBP changes(FWARC 2006/224) for the type7C keyboards
Diffstat (limited to 'usr/src/cmd/loadkeys')
| -rw-r--r-- | usr/src/cmd/loadkeys/Makefile | 9 | ||||
| -rw-r--r-- | usr/src/cmd/loadkeys/set_keyboard_layout | 15 | ||||
| -rw-r--r-- | usr/src/cmd/loadkeys/type_6/kbd_layouts | 4 |
3 files changed, 17 insertions, 11 deletions
diff --git a/usr/src/cmd/loadkeys/Makefile b/usr/src/cmd/loadkeys/Makefile index f58a966765..21f1542c4d 100644 --- a/usr/src/cmd/loadkeys/Makefile +++ b/usr/src/cmd/loadkeys/Makefile @@ -2,9 +2,8 @@ # 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. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -36,7 +35,7 @@ SUBDIRS= $($(MACH)_SUBDIRS) SRCS= $(PROG:%=%.c) ROOTHELPER= $(ROOTLIB)/set_keyboard_layout -sparc_EXTRA_INSTALL_TARGETS= +sparc_EXTRA_INSTALL_TARGETS=$(ROOTHELPER) i386_EXTRA_INSTALL_TARGETS=$(ROOTHELPER) EXTRA_INSTALL_TARGETS= $($(MACH)_EXTRA_INSTALL_TARGETS) diff --git a/usr/src/cmd/loadkeys/set_keyboard_layout b/usr/src/cmd/loadkeys/set_keyboard_layout index 0fc05936e7..a5ee80a60c 100644 --- a/usr/src/cmd/loadkeys/set_keyboard_layout +++ b/usr/src/cmd/loadkeys/set_keyboard_layout @@ -21,21 +21,28 @@ # #pragma ident "%Z%%M% %I% %E% SMI" # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # 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 keyboard-layout |\ - /usr/bin/sed -n 's/keyboard-layout=//g; s/[ | ]*//p'`" +KBD_LAYOUT_NVRAM_EXIST="`/usr/sbin/eeprom | grep keyboard-layout`" + +if test -n "$KBD_LAYOUT_NVRAM_EXIST" +then + KBD_LAYOUT_NAME="`/usr/sbin/eeprom keyboard-layout |\ + /usr/bin/sed -n 's/keyboard-layout=//g; s/[ | ]*//p'`" +else + exit 0 +fi 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`" + grep "$KBD_LAYOUT_NAME_STRING"`" else exit 0 fi diff --git a/usr/src/cmd/loadkeys/type_6/kbd_layouts b/usr/src/cmd/loadkeys/type_6/kbd_layouts index 322980cac6..d08ef809e2 100644 --- a/usr/src/cmd/loadkeys/type_6/kbd_layouts +++ b/usr/src/cmd/loadkeys/type_6/kbd_layouts @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -50,7 +50,7 @@ Greek=10 Icelandic=258 Italian=14 Japanese-type6=271 -Japanese-106/type7=15 +Japanese=15 Korean=16 Latin-American=17 Lithuanian=265 |