diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-03-21 10:25:42 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-03-21 10:25:42 +0000 |
| commit | bd93eb514e6e1f42b7e136ef8e8b277c3a9d89b0 (patch) | |
| tree | 1c20fa7a89ceae677c9cfba8727c28a214ffebc6 | |
| parent | 68c21fe2efabc7310565d1746f2954fa4ea317ad (diff) | |
| download | drakx-bd93eb514e6e1f42b7e136ef8e8b277c3a9d89b0.tar drakx-bd93eb514e6e1f42b7e136ef8e8b277c3a9d89b0.tar.gz drakx-bd93eb514e6e1f42b7e136ef8e8b277c3a9d89b0.tar.bz2 drakx-bd93eb514e6e1f42b7e136ef8e8b277c3a9d89b0.tar.xz drakx-bd93eb514e6e1f42b7e136ef8e8b277c3a9d89b0.zip | |
service_harddrake: recognise noxconf boot command line option.
This option disables the creation of /etc/X11/xorg.conf, which allows
the X server to automatically configure itself. This works better on
some hardware.
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index e54eea86d..3bcfe329d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- service_harddrake: recognise noxconf boot command line option + (disables creation of xorg.conf, allowing X server to configure itself) - cache results from detect_devices::getInputDevices() (significantly speeds up service_harddrake, and hence Live ISO boot) diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index ec6eff8b0..fb813e84f 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -357,6 +357,7 @@ foreach my $hw_class (@harddrake::data::tree) { modules::load_category($modules_conf, 'bus/usb'); $modules_conf->write; } elsif ($Ident eq "VIDEO") { + next if cat_("/proc/cmdline") =~ /noxconf/; # explicitely NOT read the existing config (eg: new profile with globetrotter) harddrake::autoconf::xconf($modules_conf, {}, member($cfg{SETUP_FB}, qw(NO no)), $cfg{RESOLUTION_WANTED}); $reboot_needed |= after_x_driver_switch(); |