summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/display_driver_helper6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/display_driver_helper b/tools/display_driver_helper
index 8f842d5..d5488c0 100644
--- a/tools/display_driver_helper
+++ b/tools/display_driver_helper
@@ -432,7 +432,11 @@ case "$1" in
;;
--load-dkms-autoload)
DKMS_AUTOLOAD_MODULE="$2"
- load_driver "$3"
+ # When booting a Live system, don't attempt to load a driver unless
+ # xorg.conf exists, otherwise we will load the wrong driver (mga#19520).
+ if [ -e /etc/X11/xorg.conf -o ! -e /run/mgalive ]; then
+ load_driver "$3"
+ fi
;;
--is-disabled)
check_driver "$2"