summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/service_harddrake1
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();