/etc/skel/.xinitrc: support $XKEYMODEL

diff --git a/debian/changelog b/debian/changelog
index fd5051f..9c784ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-etc (1.0.7) unstable; urgency=low
+
+  * /etc/skel/.xinitrc: support $XKEYMODEL
+
+ -- Michael Prokop <mika@grml.org>  Mon, 28 May 2007 13:56:38 +0200
+
 grml-etc (1.0.6) unstable; urgency=low
 
   * Add /etc/skel/.ipython/ipythonrc - configuration file

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index 669521a..a0ed5fe 100755 (executable)
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -48,7 +48,11 @@
   if [ $XKEYBOARD == "us" ] ; then
      [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
   else
-     setxkbmap "$XKEYBOARD"
+     if [ -n "$XKEYMODEL" ] ; then
+        setxkbmap -model "$XKEYMODEL" -layout "$XKEYBOARD"
+     else
+        setxkbmap "$XKEYBOARD"
+     fi
   fi
 
 # mouse for lefty: