summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/live.cfg3
-rwxr-xr-xfiles/10no-xorg-conf.xsetup6
2 files changed, 9 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 1cae9aa..079332e 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -40,6 +40,9 @@ my $_l = {
# disable Wayland when we know it won't work (workaround for mga#20079)
[ 'files/50gdm-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-disable-wayland.xsetup', { mode => 0755 } ],
),
+ # provide a noxorgconf boot command option to try to fix issues with nouveau driver on some hardware
+ [ 'files/10-no-xorg-conf.xsetup', '/etc/X11/xsetup.d/10-no-xorg-conf.xsetup', { mode => 0755 } ],
+
# blacklist pata_acpi
[ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ],
diff --git a/files/10no-xorg-conf.xsetup b/files/10no-xorg-conf.xsetup
new file mode 100755
index 0000000..bb5b289
--- /dev/null
+++ b/files/10no-xorg-conf.xsetup
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# delete xorg.conf if the user asks us to.
+if /bin/grep -q noxorgconf /proc/cmdline; then
+ rm /etc/X11/xorg.conf
+fi