[PC-BSD Commits] r6279 - pcbsd/trunk/pc-sysinstall/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-02-19 14:16:28 -0800 (Fri, 19 Feb 2010)
New Revision: 6279

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh
Log:

Slight update to kxkbrc generation, don't do "us" as default, when the user specifically chose another layout, use that by default



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh	2010-02-19 15:36:38 UTC (rev 6278)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh	2010-02-19 22:16:28 UTC (rev 6279)
@@ -54,9 +54,9 @@
    then
      localize_key_layout "$KEYLAY"
      SETXKBMAP="${SETXKBMAP} -layout ${KEYLAY}"
-     KXLAYOUT=",${KEYLAY}"
+     KXLAYOUT="${KEYLAY}"
    else
-     KXLAYOUT=""
+     KXLAYOUT="us"
    fi
 
    if [ "${KEYVAR}" != "NONE" ]
@@ -87,9 +87,9 @@
 
    # Create the kxkbrc configuration using these options
    echo "[Layout]
-DisplayNames=us${KXLAYOUT}
+DisplayNames=${KXLAYOUT}
 IndicatorOnly=false
-LayoutList=us${KXLAYOUT}${KXVAR}
+LayoutList=${KXLAYOUT}${KXVAR}
 Model=${KXMODEL}
 Options=grp:alt_shift_toggle,ctrl:nocaps
 ResetOldOptions=true