From 2f0e6019891c7f9827dbbc63dbc129a1cdfbd252 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 4 Sep 2007 01:43:06 +0200 Subject: [PATCH] /etc/skel/.xinitrc: make sure /etc/sysconfig/keyboard is readable --- debian/changelog | 6 ++++++ etc/skel/.xinitrc | 18 +++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f27e6a..604f9a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-etc (1.0.17) unstable; urgency=low + + * /etc/skel/.xinitrc: make sure /etc/sysconfig/keyboard is readable. + + -- Michael Prokop Tue, 4 Sep 2007 01:42:50 +0200 + grml-etc (1.0.16) unstable; urgency=low * Adjust /etc/inittab.grml + /etc/inittab.small so ctrl-alt-del diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc index a0ed5fe..7172324 100755 --- a/etc/skel/.xinitrc +++ b/etc/skel/.xinitrc @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # 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] +# Latest change: Die Sep 04 01:42:40 CEST 2007 [mika] ################################################################################ # is something goes wrong fall back to plain x-terminal-emulator: @@ -44,14 +44,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 -- 2.1.4