summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-03-21 10:49:01 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-03-22 18:46:35 +0000
commitaa7905150f12465a6d289dc8834117ee982d2e5d (patch)
tree89abf6715ef738a5aca0df375507f20aed35b641
parent816f3de870231824cfb70b32553c110304456ab9 (diff)
downloaddraklive-config-aa7905150f12465a6d289dc8834117ee982d2e5d.tar
draklive-config-aa7905150f12465a6d289dc8834117ee982d2e5d.tar.gz
draklive-config-aa7905150f12465a6d289dc8834117ee982d2e5d.tar.bz2
draklive-config-aa7905150f12465a6d289dc8834117ee982d2e5d.tar.xz
draklive-config-aa7905150f12465a6d289dc8834117ee982d2e5d.zip
Remove support for noxorgconf boot option.
This is now done in service_harddrake.
-rw-r--r--config/build.cfg3
-rwxr-xr-xfiles/10no-xorg-conf.xsetup6
2 files changed, 0 insertions, 9 deletions
diff --git a/config/build.cfg b/config/build.cfg
index 749a964..5d8cfe1 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -210,9 +210,6 @@ my $config = {
[ 'files/empty.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
[ 'files/empty.conf', '/etc/modprobe.conf', { mode => 0644 } ],
- # Provide a noxorgconf boot command option to try to fix issues with nouveau driver on some hardware.
- [ 'files/10no-xorg-conf.xsetup', '/etc/X11/xsetup.d/10no-xorg-conf.xsetup', { mode => 0755 } ],
-
# Blacklist pata_acpi (mga#3395).
[ '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
deleted file mode 100755
index bb5b289..0000000
--- a/files/10no-xorg-conf.xsetup
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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