diff options
| author | Dirk von Suchodoletz | 2009-01-11 22:50:42 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-01-11 22:50:42 +0100 |
| commit | 4cbd6c0622e693f279c9264d8c4119855dbafb86 (patch) | |
| tree | f71c21d0e61d7a0497dfd349984cb83f183262e9 /os-plugins | |
| parent | Fixes to xserver plugin ... (diff) | |
| download | core-4cbd6c0622e693f279c9264d8c4119855dbafb86.tar.gz core-4cbd6c0622e693f279c9264d8c4119855dbafb86.tar.xz core-4cbd6c0622e693f279c9264d8c4119855dbafb86.zip | |
More fixes for xserver setup ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2465 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 8 | ||||
| -rw-r--r-- | os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh index b7024282..c5e2e73c 100644 --- a/os-plugins/plugins/xserver/XX_xserver.sh +++ b/os-plugins/plugins/xserver/XX_xserver.sh @@ -50,8 +50,8 @@ if [ -e /initramfs/plugin-conf/xserver.conf -a \ ###################################################################### # begin proprietary drivers section (xorg.conf part) ###################################################################### - set -x + waitfor /etc/hwinfo.data 10000 if [ $(grep -i -m 1 'Module: fglrx' \ /etc/hwinfo.data | wc -l) -ge "1" -a $xserver_prefnongpl -eq 1 ] then @@ -135,7 +135,6 @@ Section "InputDevice" Option "XkbRules" "xorg" Option "XkbModel" "pc105" Option "XkbLayout" "us" - Option "XkbVariant" "nodeadkeys" EndSection Section "InputDevice" Identifier "Generic Mouse" @@ -183,6 +182,11 @@ EndSection' >> $xfc else sed "s/\"us\"/\"${XKEYBOARD}\"/" -i $xfc fi + # set nodeadkeys for special layouts + if [ ${XKEYBOARD} = "de" ]; then + sed -e '/\"XkbLayout\"/a\\ \ Option "XkbVariant" "nodeadkeys"' \ + -i $xfc + fi # these directories might be distro specific for file in /var/lib/xkb/compiled ; do testmkd /mnt/${file} diff --git a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh index 4efee5a3..5af4d605 100644 --- a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh +++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh @@ -17,8 +17,8 @@ tabletdetect () { fi } +( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) & ( hwinfo --monitor >/etc/hwinfo.display; grep "Generic Monitor" \ /etc/hwinfo.display >/dev/null 2>&1 && rm /etc/hwinfo.display ) & -( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) & ( tabletdetect ) & |