X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.xinitrc;h=717232400c6c43411e0b74e42e7207d8e257fb04;hb=95908eac598f3fd493825b79192dc967d62bc4ae;hp=a0ed5fe79a0190cc5c4b8f608e1c4aaf2a8e1558;hpb=485c20d992931f32b8a3ae210fff31c0fbb620cb;p=grml-etc.git

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index a0ed5fe..7172324 100755
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -4,7 +4,7 @@
 # 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: Sam Dez 16 16:45:54 CET 2006 [mika]
+# Latest change: Die Sep 04 01:42:40 CEST 2007 [mika]
 ################################################################################
 
 # is something goes wrong fall back to plain x-terminal-emulator:
@@ -44,14 +44,18 @@
   [ -r $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
 
 # keybindings
-  . /etc/sysconfig/keyboard && \
-  if [ $XKEYBOARD == "us" ] ; then
-     [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
+  if ! [ -r /etc/sysconfig/keyboard ] ; then
+     [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us
   else
-     if [ -n "$XKEYMODEL" ] ; then
-        setxkbmap -model "$XKEYMODEL" -layout "$XKEYBOARD"
+     . /etc/sysconfig/keyboard
+     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
   fi