X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.xinitrc;h=8b5938daa83ddccbbffeb4394711078e712edee8;hb=986780d33b936a9ac190eef9c06f54b41b767c9e;hp=717232400c6c43411e0b74e42e7207d8e257fb04;hpb=2f0e6019891c7f9827dbbc63dbc129a1cdfbd252;p=grml-etc.git

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index 7172324..8b5938d 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: Die Sep 04 01:42:40 CEST 2007 [mika]
 ################################################################################
 
 # is something goes wrong fall back to plain x-terminal-emulator:
@@ -20,7 +19,7 @@
 # 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" &
+     osd_cat -c white -A center -p middle -f "-misc-fixed-medium-r-normal-*-15-150-*-*-c-*-iso8859-15" &
   fi
 
 # add at least one entry to xauth
@@ -40,6 +39,10 @@
 # other settings:
 # xset m 20/10 4
 
+# disable screensaver and dpms:
+# xset s off
+# xset -dpms
+
 # xresources
   [ -r $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
 
@@ -48,7 +51,7 @@
      [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us
   else
      . /etc/sysconfig/keyboard
-     if [ $XKEYBOARD == "us" ] ; then
+     if [ "$XKEYBOARD" = "us" ] ; then
         [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
      else
         if [ -n "$XKEYMODEL" ] ; then
@@ -68,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 #################################################################