X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.xinitrc;h=30f299100a690343f0e00903da2b1d7cc3e1ccd1;hb=5ec762288e16f5d985e94e3a74b66a3d2ccf9e95;hp=669521ad99f6ab6e3ecffc0003fb2040dc705fb4;hpb=4015c56374b5dc2e18dfeca4ebb2f9467c60100c;p=grml-etc.git

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index 669521a..30f2991 100755
--- 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:
@@ -40,15 +39,27 @@
 # other settings:
 # xset m 20/10 4
 
+# disable screensaver and dpms:
+# xset s off
+# xset -dpms
+
 # xresources
   [ -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
-     setxkbmap "$XKEYBOARD"
+     . /etc/sysconfig/keyboard
+     if [ $XKEYBOARD == "us" ] ; then
+        [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
+     else
+        if [ -n "$XKEYMODEL" ] ; then
+           setxkbmap -model "$XKEYMODEL" -layout "$XKEYBOARD"
+        else
+           setxkbmap "$XKEYBOARD"
+        fi
+     fi
   fi
 
 # mouse for lefty:
@@ -60,6 +71,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 #################################################################