summaryrefslogtreecommitdiffstats
path: root/tools/display_driver_helper
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-12-02 21:31:48 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-12-02 21:32:19 +0000
commit4cf825b5fe01beaa41e9acbd1af53af52d94067b (patch)
treefd9df137df2f89a7f0109f054393f3e46653965e /tools/display_driver_helper
parent0c677e09524bfe7890285bcb1135a75cd42d8e80 (diff)
downloaddrakx-kbd-mouse-x11-4cf825b5fe01beaa41e9acbd1af53af52d94067b.tar
drakx-kbd-mouse-x11-4cf825b5fe01beaa41e9acbd1af53af52d94067b.tar.gz
drakx-kbd-mouse-x11-4cf825b5fe01beaa41e9acbd1af53af52d94067b.tar.bz2
drakx-kbd-mouse-x11-4cf825b5fe01beaa41e9acbd1af53af52d94067b.tar.xz
drakx-kbd-mouse-x11-4cf825b5fe01beaa41e9acbd1af53af52d94067b.zip
Prevent dkms autoload of display driver on Live system before xorg.conf exists (mga#19520).
Diffstat (limited to 'tools/display_driver_helper')
-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"