/etc/skel/.xinitrc: run 'setxkbmap "$XKEYBOARD"' and drop

"[ $XKEYBOARD == "de" ] ... modmap $HOME/.Xmodmap.german",
this should fix our deadkeys problem for lang=de* and support
additional languages as well.

diff --git a/debian/changelog b/debian/changelog
index c935448..edbb301 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-etc (0.8-35) unstable; urgency=low
+
+  * /etc/skel/.xinitrc: run 'setxkbmap "$XKEYBOARD"' and drop
+    "[ $XKEYBOARD == "de" ] ... modmap $HOME/.Xmodmap.german",
+    this should fix our deadkeys problem for lang=de* and support
+    additional languages as well.
+
+ -- Michael Prokop <mika@grml.org>  Tue, 14 Nov 2006 13:32:28 +0100
+
 grml-etc (0.8-34) unstable; urgency=low
 
   * /etc/skel/.kshrc: adjust header information, replace tabs

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index d2c5bca..777015f 100755 (executable)
--- 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: Mon Jun 12 13:56:28 CEST 2006 [mika]
+# Latest change: Die Nov 14 13:32:00 CET 2006 [mika]
 ################################################################################
 
 # is something goes wrong fall back to plain xterm:
@@ -19,8 +19,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
@@ -46,20 +46,20 @@
 # 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
+     [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
+  else
+     setxkbmap "$XKEYBOARD"
   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
+# default entry, use e.g. 'grml-x windowmanager' for changing or just adjust manually
   exec /usr/bin/wm-ng
 
 ## END OF FILE #################################################################