Author: se
Date: Mon Sep 22 11:54:13 2014
New Revision: 271958
URL: http://svnweb.freebsd.org/changeset/base/271958
Log:
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
Modified:
head/etc/rc.d/syscons
Modified: head/etc/rc.d/syscons
==============================================================================
--- head/etc/rc.d/syscons Mon Sep 22 11:35:06 2014 (r271957)
+++ head/etc/rc.d/syscons Mon Sep 22 11:54:13 2014 (r271958)
@@ -167,7 +167,7 @@ syscons_configure_keyboard()
# keymap
#
case ${keymap} in
- [Nn][Oo] | '')
+ NO | '')
;;
*)
sc_init
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
