diff options
author | se <se@FreeBSD.org> | 2014-09-22 11:54:13 +0000 |
---|---|---|
committer | se <se@FreeBSD.org> | 2014-09-22 11:54:13 +0000 |
commit | 4acc8ae3764b8098473f377a4898ba90ba195e78 (patch) | |
tree | fc931383303eedc9a6685bdfa664c24ccc495d1c /etc/rc.d | |
parent | 1eb6a7500b6a6588e6845e6b63deeb86f3b246c0 (diff) | |
download | FreeBSD-src-4acc8ae3764b8098473f377a4898ba90ba195e78.zip FreeBSD-src-4acc8ae3764b8098473f377a4898ba90ba195e78.tar.gz |
The new naming scheme for keymap files for use with vt(4) introduced a
collision for "no" as a country code with "NO" meaning "do not load any
keymap" (which also has been the default value in etc/defaults/rc.conf
for a long time).
The result of this collision is, that "kbdcontrol -l no" will load the
Norwegian keymap, while "keymap=no" in rc.conf was interpreted as the
lower case spelling of "NO" meaning "no keyboard" (and "no.kbd" was not
loaded).
Fix this by matching only the upper-case spelling "NO" in rc.d/syscons
when deciding whether to load a keymap file.
This will lead to "no.kbd" being loaded, if the until now valid (but
non-default) spelling "no" was used in an individual rc.conf file to mean
"no keyboard". But all alternatives I could think of introduce a larger
violation of POLA ...
Reported by: Gyrd Thane Lange (gyrd-se at thanelange.no)
MFC after: 3 days
Diffstat (limited to 'etc/rc.d')
-rwxr-xr-x | etc/rc.d/syscons | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons index 0dc41ad..a60ac4c 100755 --- a/etc/rc.d/syscons +++ b/etc/rc.d/syscons @@ -167,7 +167,7 @@ syscons_configure_keyboard() # keymap # case ${keymap} in - [Nn][Oo] | '') + NO | '') ;; *) sc_init |