From owner-freebsd-current@FreeBSD.ORG Sun Sep 21 16:46:55 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 847D67B2 for ; Sun, 21 Sep 2014 16:46:55 +0000 (UTC) Received: from galore.getmail.no (galore.getmail.no [84.210.184.6]) by mx1.freebsd.org (Postfix) with ESMTP id 36E94D80 for ; Sun, 21 Sep 2014 16:46:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by galore.getmail.no (Postfix) with ESMTP id 9EE23414EA for ; Sun, 21 Sep 2014 18:39:38 +0200 (CEST) Received: from galore.getmail.no ([127.0.0.1]) by localhost (galore.get.c.bitbit.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id twqqvUxPkt5H for ; Sun, 21 Sep 2014 18:39:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by galore.getmail.no (Postfix) with ESMTP id 2AC57457EF for ; Sun, 21 Sep 2014 18:39:38 +0200 (CEST) X-Virus-Scanned: amavisd-new at galore.get.c.bitbit.net Received: from galore.getmail.no ([127.0.0.1]) by localhost (galore.get.c.bitbit.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 0qFoYAiZTAxe for ; Sun, 21 Sep 2014 18:39:38 +0200 (CEST) Received: from onyx.thanelange.no (cm-84.208.179.208.getinternet.no [84.208.179.208]) by galore.getmail.no (Postfix) with ESMTP id 0674A42D19 for ; Sun, 21 Sep 2014 18:39:38 +0200 (CEST) Date: Sun, 21 Sep 2014 18:39:36 +0200 From: Gyrd Thane Lange To: freebsd-current@freebsd.org Subject: [patch] syscons/vt keymap: Norwegian country code conflicts with default value Message-ID: <20140921183936.03617590@onyx.thanelange.no> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.22; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/P1rm_rClhgPAl2o3+cdNbqO" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Sep 2014 16:46:55 -0000 --MP_/P1rm_rClhgPAl2o3+cdNbqO Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline 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. Also available here: http://onyx.thanelange.no/freebsd/patches/syscons.patch Best regards Gyrd ^_^ --MP_/P1rm_rClhgPAl2o3+cdNbqO Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=syscons.patch Index: etc/defaults/rc.conf =================================================================== --- etc/defaults/rc.conf (revision 271880) +++ etc/defaults/rc.conf (working copy) @@ -531,7 +531,7 @@ ############################################################## keyboard="" # keyboard device to use (default /dev/kbd0). -keymap="NO" # keymap in /usr/share/{syscons,vt}/keymaps/* (or NO). +keymap="" # keymap in /usr/share/{syscons,vt}/keymaps/* (or empty). keyrate="NO" # keyboard rate to: slow, normal, fast (or NO). keybell="NO" # See kbdcontrol(1) for options. Use "off" to disable. keychange="NO" # function keys default values (or NO). Index: etc/rc.d/syscons =================================================================== --- etc/rc.d/syscons (revision 271880) +++ etc/rc.d/syscons (working copy) @@ -167,7 +167,7 @@ # keymap # case ${keymap} in - [Nn][Oo] | '') + '') ;; *) sc_init --MP_/P1rm_rClhgPAl2o3+cdNbqO--