diff options
author | Dirk von Suchodoletz | 2010-08-06 23:15:29 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2010-08-06 23:15:29 +0200 |
commit | 134a597db77ef479383371d75b42801c7626aa2b (patch) | |
tree | d4d5571bc7f3492ad313021a88a3b73689dea283 /os-plugins/plugins/xserver | |
parent | Some minor cleanups for the re-written Xserver plugin ... still to be (diff) | |
download | core-134a597db77ef479383371d75b42801c7626aa2b.tar.gz core-134a597db77ef479383371d75b42801c7626aa2b.tar.xz core-134a597db77ef479383371d75b42801c7626aa2b.zip |
Minor changes for the Xserver plugin stuff ...
Diffstat (limited to 'os-plugins/plugins/xserver')
-rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm | 3 | ||||
-rw-r--r-- | os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm index 90fe5086..55f42117 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm @@ -42,7 +42,8 @@ sub setupXserverScript $script .= unshiftHereDoc(<<' End-of-Here'); # SuSE specific extension to stage3 xserver.sh # Xorg hardware is autodetected, so no module information provided - sed -e "/Section \"Device\"/,/EndSection/d" -i ${xfc} + [ -z "${xmodule}" ] && \ + sed "/Section \"Device\"/,/EndSection/d" -i ${xfc} testmkd /mnt/etc/X11/xorg.conf.d testmkd /mnt/var/lib/xkb/compiled testmkd /mnt/var/lib/X11 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 579e5a9a..3e50b77f 100644 --- a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh +++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh @@ -36,7 +36,8 @@ tabletdetect () { } # hardware detection not really needed for Xorg => 1.7 used in newer versions -# distro distinguishing here not 100% conform to the OpenSLX ideas ... +# distro distinguishing here not 100% conform to the OpenSLX ideas. Hardware +# detection might be needed for proprietary Xorg drivers ... # (clean up expected with rewritten stage3) case ${slxconf_distro_ver} in "10.04"|"11.3") |