X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.xinitrc;h=a0ed5fe79a0190cc5c4b8f608e1c4aaf2a8e1558;hb=c7b59f63dacb4da9edcab7ff89ec92fe71c4d753;hp=777015f6970d6accff41f72f377a6f53dee00b6a;hpb=5566f3c030cb83733bd820cda80e097cc0569497;p=grml-etc.git

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index 777015f..a0ed5fe 100755
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -4,11 +4,11 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Die Nov 14 13:32:00 CET 2006 [mika]
+# Latest change: Sam Dez 16 16:45:54 CET 2006 [mika]
 ################################################################################
 
-# is something goes wrong fall back to plain xterm:
-#  failsafe="xterm -ls -T failsafe -geometry 80x24-0-0"
+# is something goes wrong fall back to plain x-terminal-emulator:
+#  failsafe="x-terminal-emulator -ls -T failsafe -geometry 80x24-0-0"
 #  trap "exec $failsafe" EXIT 1 2 13 15
 
 # set wallpaper
@@ -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: