From: Evgeni Golov <evgeni.golov@credativ.de>
Date: Tue, 11 Nov 2014 13:01:18 +0000 (+0100)
Subject: Set cirrus modeset=0 to prevent hang on QEMU
X-Git-Tag: v0.26.3~1
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=e6a20868b694fd09616355c7d03c77d4b371836a;ds=sidebyside

Set cirrus modeset=0 to prevent hang on QEMU

See: https://bugs.debian.org/768157
---

diff --git a/etc/grml/fai/config/files/etc/modprobe.d/modesetting.conf/GRMLBASE b/etc/grml/fai/config/files/etc/modprobe.d/modesetting.conf/GRMLBASE
new file mode 100644
index 0000000..5d05c38
--- /dev/null
+++ b/etc/grml/fai/config/files/etc/modprobe.d/modesetting.conf/GRMLBASE
@@ -0,0 +1,13 @@
+# This file was deployed via grml-live's
+# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/39-modprobe script, using
+# ${GRML_FAI_CONFIG}/config/files/etc/modprobe.d/modesetting.conf/GRMLBASE
+#
+# Filename:      /etc/modprobe.d/modesetting.conf
+# Purpose:       Disable cirrus modesetting due to https://bugs.debian.org/768157
+# Authors:       grml-team (grml.org),
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+################################################################################
+
+options cirrus modeset=0
+options mgag200 modeset=1