[PC-BSD Commits] r1938 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-05-21 09:02:25 -0700 (Wed, 21 May 2008)
New Revision: 1938

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh
Log:

Added options to have variant disabled for setxkbmap



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2008-05-21 15:00:47 UTC (rev 1937)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2008-05-21 16:02:25 UTC (rev 1938)
@@ -10,6 +10,12 @@
 MODEL="`cat /uzip/.keymodel`" ; export MODEL
 VARIANT="`cat /uzip/.keyvariant`" ; export VARIANT
 
+# If the variant is turned off, set the variable to ""
+if [ "$VARIANT" = "off" ]
+then
+  VARIANT="" ; export VARIANT
+fi
+
 HEADERS="xorg.conf.generic
 ati.xorg.conf
 ati-3d-enable.xorg.conf

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2008-05-21 15:00:47 UTC (rev 1937)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2008-05-21 16:02:25 UTC (rev 1938)
@@ -4,7 +4,12 @@
 model=$2
 variant=$3
 
-setxkbmap -model $model -layout $layout -variant $variant
+if [ "$variant" = "off" ]
+then
+  setxkbmap -model $model -layout $layout
+else
+  setxkbmap -model $model -layout $layout -variant $variant
+fi
 
 # Save the keyboard setup so the SaveKeyboard.sh script can later use values
 echo "$model" >/uzip/.keymodel