Use x-window-manager as default window manager in xinitrc

[grml-etc.git] / etc / skel / .xinitrc

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index a0ed5fe..a0fb306 100755 (executable)
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -4,7 +4,6 @@
 # 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]
 ################################################################################
 
 # is something goes wrong fall back to plain x-terminal-emulator:
@@ -44,14 +43,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
 
@@ -64,6 +67,6 @@
   [ -r /etc/grml_cd ] && grml-info &
 
 # default entry, use e.g. 'grml-x windowmanager' for changing or just adjust manually
-  exec /usr/bin/wm-ng
+  exec /usr/bin/x-window-manager
 
 ## END OF FILE #################################################################