From owner-freebsd-bugs@FreeBSD.ORG Fri Feb 11 15:20:08 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 513E010656A9 for ; Fri, 11 Feb 2011 15:20:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 140C68FC23 for ; Fri, 11 Feb 2011 15:20:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1BFK70G084945 for ; Fri, 11 Feb 2011 15:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1BFK7KW084944; Fri, 11 Feb 2011 15:20:07 GMT (envelope-from gnats) Resent-Date: Fri, 11 Feb 2011 15:20:07 GMT Resent-Message-Id: <201102111520.p1BFK7KW084944@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kris Moore Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2FBC106566C for ; Fri, 11 Feb 2011 15:12:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id D1E6B8FC18 for ; Fri, 11 Feb 2011 15:12:41 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p1BFCfSm039211 for ; Fri, 11 Feb 2011 15:12:41 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p1BFCfOH039207; Fri, 11 Feb 2011 15:12:41 GMT (envelope-from nobody) Message-Id: <201102111512.p1BFCfOH039207@red.freebsd.org> Date: Fri, 11 Feb 2011 15:12:41 GMT From: Kris Moore To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: bin/154687: bin: usr.sbin/pc-sysinstall - Fixed sorting for keyboard layouts X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 15:20:08 -0000 >Number: 154687 >Category: bin >Synopsis: bin: usr.sbin/pc-sysinstall - Fixed sorting for keyboard layouts >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Feb 11 15:20:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Kris Moore >Release: 9.0-Current >Organization: PC-BSD / iXsystems >Environment: FreeBSD 9.0-CURRENT >Description: This small fix is for the sorting of available keyboard layouts to a more sane default. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh --- usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh 2011-01-27 10:26:03.667376965 -0500 +++ usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh 2011-01-27 11:04:16.000000000 -0500 @@ -26,6 +26,12 @@ # $FreeBSD$ FOUND="0" +TMPLIST="/tmp/.xkeyList.$$" +XLST="/usr/local/share/X11/xkb/rules/xorg.lst" + +if [ ! -e "${XLST}" ] ; then + exit 1 +fi # Lets parse the xorg.list file, and see what layouts are supported while read line @@ -36,9 +42,9 @@ echo $line | grep '! ' >/dev/null 2>/dev/null if [ "$?" = "0" ] then - exit 0 + break else - echo "$line" + echo "$line" >> ${TMPLIST} fi fi @@ -51,6 +57,13 @@ fi fi -done < /usr/local/share/X11/xkb/rules/xorg.lst +done < $XLST + +# Display the output, with us English as the first entry +echo "us U.S. English" +sort -b -d +1 $TMPLIST + +# Delete the tmp file +rm $TMPLIST exit 0 >Release-Note: >Audit-Trail: >Unformatted: