Stefan Esser
2014-Sep-22 12:09 UTC
[patch] syscons/vt keymap: Norwegian country code conflicts with default value
Am 21.09.2014 um 18:39 schrieb Gyrd Thane Lange:> Hi, > > Recent changes in keymap namning for syscons/vt to use shorter names > has exposed a conflict with the value "no" both used as country code > for Norway and as a default value indicating that no keymap is set. > > The attached patch proposes to use "" (empty string) as default value > instead.Hi Gyrd, thank you for reporting the issue! I have just committed a slightly different patch to -CURRENT and plan to merge it to 10-STABLE in time for the next BETA. You may want to check-out r271958 ... The approach I have chosen it to let "NO" continue to stand for "do not load any keymap", while "no" is now recognized as equivalent to "no.kbd". The new semantics of the keymap parameter in rc.conf are: keymap='' ==> do not load any keymap (unchanged) keymap=NO ==> do not load any keymap (unchanged) keymap=no ==> load Norwegian keymap (new) This may still catch people that have edited rc.conf to use "no" in the meaning "no keymap" by accident, but I see no other approach that better complies with POLA ... An alternative to a MFC to 10-STABLE (and 10.1) might be to mention this specific case in the release notes (and to suggest "keymap=no.kbd" as a work-around). But I'll try to get approval for the MFC in time for 10.1-BETA3 ... Regards, STefan
Tijl Coosemans
2014-Sep-22 17:28 UTC
[patch] syscons/vt keymap: Norwegian country code conflicts with default value
On Mon, 22 Sep 2014 14:09:54 +0200 Stefan Esser <se at freebsd.org> wrote:> Am 21.09.2014 um 18:39 schrieb Gyrd Thane Lange: > > Hi, > > > > Recent changes in keymap namning for syscons/vt to use shorter names > > has exposed a conflict with the value "no" both used as country code > > for Norway and as a default value indicating that no keymap is set. > > > > The attached patch proposes to use "" (empty string) as default value > > instead. > > Hi Gyrd, > > thank you for reporting the issue! > > I have just committed a slightly different patch to -CURRENT and plan > to merge it to 10-STABLE in time for the next BETA. > > You may want to check-out r271958 ... > > > The approach I have chosen it to let "NO" continue to stand for "do > not load any keymap", while "no" is now recognized as equivalent to > "no.kbd". > > > The new semantics of the keymap parameter in rc.conf are: > > keymap='' ==> do not load any keymap (unchanged) > keymap=NO ==> do not load any keymap (unchanged) > keymap=no ==> load Norwegian keymap (new) > > This may still catch people that have edited rc.conf to use "no" in > the meaning "no keymap" by accident, but I see no other approach that > better complies with POLA ...Maybe NONE. It's already being used in a number of cases.