summaryrefslogtreecommitdiffstats
path: root/tools/display_driver_helper
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2011-06-15 12:40:06 +0000
committerAnssi Hannula <anssi@mageia.org>2011-06-15 12:40:06 +0000
commit31256e522a585d81179b29fbbf87c643d112e4f6 (patch)
tree838446fe5247fda69d5006ee6a0ec69831049987 /tools/display_driver_helper
parent879a7042a1b9d7b9fd56d374bd71f01729e093f2 (diff)
downloaddrakx-kbd-mouse-x11-31256e522a585d81179b29fbbf87c643d112e4f6.tar
drakx-kbd-mouse-x11-31256e522a585d81179b29fbbf87c643d112e4f6.tar.gz
drakx-kbd-mouse-x11-31256e522a585d81179b29fbbf87c643d112e4f6.tar.bz2
drakx-kbd-mouse-x11-31256e522a585d81179b29fbbf87c643d112e4f6.tar.xz
drakx-kbd-mouse-x11-31256e522a585d81179b29fbbf87c643d112e4f6.zip
display_driver_helper: allow automatic loading of the implicit driver
on systems without xorg.conf if the presence of other files indicates that this is not a live cd boot before automatic X.org configuration (fixes radeon KMS without xorg.conf)
Diffstat (limited to 'tools/display_driver_helper')
-rw-r--r--tools/display_driver_helper9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index 90ab102..8fe73f5 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -234,8 +234,13 @@ check_xorg() {
# no driver is selected - don't load if explicit_only is 1
[ "$explicit_only" = "1" ] && return 1
- # implicit load allowed; still don't load if no xorg.conf (i.e. live cd)
- [ -e "/etc/X11/xorg.conf" ]
+ # implicit load allowed; only load if there is evidence that this is
+ # not a live cd or similar with automatic configuration occurring later
+ # in the boot process (which might configure a driver conflicting with
+ # the implicit driver, e.g. a proprietary one)
+ # TODO: Could this be replaced with a more robust check?
+ [ -e "/etc/X11/xorg.conf" ] || [ -e "/etc/sysconfig/harddrake2/kernels" ] ||
+ [ -e "/etc/sysconfig/harddrake2/xorg" ] || [ -e "/boot/grub/menu.lst" ]
}
# Load the driver for the specified modalias, if configured.