From 4cf825b5fe01beaa41e9acbd1af53af52d94067b Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Fri, 2 Dec 2016 21:31:48 +0000 Subject: Prevent dkms autoload of display driver on Live system before xorg.conf exists (mga#19520). --- tools/display_driver_helper | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools/display_driver_helper') 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" -- cgit v1.2.1