summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 11:52:49 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 11:52:49 +0000
commit6f688832ece31330983de447383dc5b54925da92 (patch)
tree24f3b126f0b29584dcf8cfebbb1cb75b518fa384
parent2ecf80db3e0033812fb9ea1d61e84b619150cc74 (diff)
downloaddraklive-config-6f688832ece31330983de447383dc5b54925da92.tar
draklive-config-6f688832ece31330983de447383dc5b54925da92.tar.gz
draklive-config-6f688832ece31330983de447383dc5b54925da92.tar.bz2
draklive-config-6f688832ece31330983de447383dc5b54925da92.tar.xz
draklive-config-6f688832ece31330983de447383dc5b54925da92.zip
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.
-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 e4f8d32..84b49e2 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -49,6 +49,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