diff options
Diffstat (limited to 'os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh')
| -rw-r--r-- | os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh | 22 |
1 files changed, 13 insertions, 9 deletions
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 f9c3e7a7..b366683d 100644 --- a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh +++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh @@ -1,5 +1,5 @@ # Copyright (c) 2008 - RZ Uni Freiburg -# Copyright (c) 2008 - OpenSLX GmbH +# Copyright (c) 2008..2010 - OpenSLX GmbH # # This program/file is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -19,11 +19,6 @@ # automatic Xorg configation fails in this field. If no useable info was # detected just delete the file. -# not really needed for ubuntu 10.04 -# ToDo: fix so it is not installed by default -#echo ${slx_distro_name}${slx_distro_ver}>/tmp/utest -#[ ${slx_distro_name} = "ubuntu" ] && [ ${slx_distro_ver} = "10.04" ] && exit 0 - # tablet detection function tabletdetect () { sleep 1; waitfor /etc/hwinfo.bios 20000 @@ -40,7 +35,16 @@ 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 ) & +# not really needed for Xorg => 1.7 used in newer versions +case ${slx_distro_ver} in + "10.04"|"11.3") + echo ${slx_distro_ver}>/tmp/xsrv + exit 0 + ;; + *) + ( hwinfo --gfxcard >/etc/hwinfo.gfxcard ) & + ( hwinfo --monitor >/etc/hwinfo.display; grep "Generic Monitor" \ + /etc/hwinfo.display >/dev/null 2>&1 && rm /etc/hwinfo.display ) & + ;; +esac ( tabletdetect ) & |