summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 11:52:49 (GMT)
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 19:45:30 (GMT)
commit9ed3af28563ff8573221731402122d696195c3a6 (patch)
treed337c180ab7c293a702ad018606b75058efbbbd5
parentb6a40abe0a9f4127a1def0ac5b5667e963eebd80 (diff)
Fix for mga#18724 - set vboxvideo.modeset=0 in /etc/modprobe.d.
This avoids a conflict between the VBoxVideo X11 driver and the vboxvideo kernel module which prevented X starting. (cherry picked from commit 6f688832ece31330983de447383dc5b54925da92)
-rw-r--r--config/live.cfg2
-rw-r--r--files/vboxvideo.conf1
2 files changed, 3 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 22471c8..1cb3e4b 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -40,6 +40,8 @@ my $_l = {
),
# blacklist pata_acpi
[ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ],
+ # disable vboxvideo modesetting
+ [ 'files/vboxvideo.conf', '/etc/modprobe.d/vboxvideo.conf', { mode => 0644 } ],
# clean live files
[ 'files/live.51-mageia-resume.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
diff --git a/files/vboxvideo.conf b/files/vboxvideo.conf
new file mode 100644
index 0000000..8ded6ad
--- /dev/null
+++ b/files/vboxvideo.conf
@@ -0,0 +1 @@
+options vboxvideo modeset=0