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

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index d2c5bca..30f2991 100755
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -4,11 +4,10 @@
 # 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: Mon Jun 12 13:56:28 CEST 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
@@ -19,8 +18,8 @@
 
 # print info text
   if [ -x /usr/bin/osd_cat ] ; then
-    echo "Starting X window system and loading window manager..." | \
-    osd_cat -c white -A center -p middle -f "-misc-fixed-medium-r-normal-*-*-150-*-*-c-*-iso8859-15" &
+     echo "Starting X window system and loading window manager..." | \
+     osd_cat -c white -A center -p middle -f "-misc-fixed-medium-r-normal-*-*-150-*-*-c-*-iso8859-15" &
   fi
 
 # add at least one entry to xauth
@@ -40,26 +39,38 @@
 # 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
-  fi
-  if [ $XKEYBOARD == "de" ] ; then
-    [ -r $HOME/.Xmodmap.german ] && xmodmap $HOME/.Xmodmap.german
+  if ! [ -r /etc/sysconfig/keyboard ] ; then
+     [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us
+  else
+     . /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:
 # xmodmap -e "pointer = 3 2 1"
 # mouse for right hander:
 # xmodmap -e "pointer = 1 2 3"
 
-# start browser with startpage.html
-  grml-info &
+# start browser with startpage.html, but only in live-cd mode
+  [ -r /etc/grml_cd ] && grml-info &
 
-# default entry, use e.g. 'grml-x windowmanager' for changing
-  exec /usr/bin/wm-ng
+# default entry, use e.g. 'grml-x windowmanager' for changing or just adjust manually
+  exec /usr/bin/x-window-manager
 
 ## END OF FILE #################################################################