From 9ed3af28563ff8573221731402122d696195c3a6 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 12 Nov 2016 11:52:49 +0000
Subject: 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)
---
 config/live.cfg      | 2 ++
 files/vboxvideo.conf | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 files/vboxvideo.conf

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
-- 
cgit v1.2.1