summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins/xserver/init-hooks
diff options
context:
space:
mode:
authorDirk von Suchodoletz2010-03-09 21:27:15 +0100
committerDirk von Suchodoletz2010-03-09 21:27:15 +0100
commitf435a9a2c5d31d71403767b23757aaecd449ae68 (patch)
tree00f1361c8d5203089dee21a27504a85f6690b758 /os-plugins/plugins/xserver/init-hooks
parentChanging distro-specific stuff to change default to Ubuntu 10.04 ... (diff)
downloadcore-f435a9a2c5d31d71403767b23757aaecd449ae68.tar.gz
core-f435a9a2c5d31d71403767b23757aaecd449ae68.tar.xz
core-f435a9a2c5d31d71403767b23757aaecd449ae68.zip
Rearranging stuff for new Ubuntu ... Problem with init-hook (unneeded
for 10.04) ...
Diffstat (limited to 'os-plugins/plugins/xserver/init-hooks')
-rw-r--r--os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh6
1 files changed, 5 insertions, 1 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 71d185e0..f9c3e7a7 100644
--- a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
+++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
@@ -19,6 +19,11 @@
# 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
@@ -39,4 +44,3 @@ tabletdetect () {
( hwinfo --monitor >/etc/hwinfo.display; grep "Generic Monitor" \
/etc/hwinfo.display >/dev/null 2>&1 && rm /etc/hwinfo.display ) &
( tabletdetect ) &
-