summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/service_harddrake4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1e8fe3459..8662b1159 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- harddrake service: do not try to reconfigure xorg driver and crash
+ if /etc/X11/xorg does not exist (breaks One startup)
- bootloader suggestion fixes (to fix removal of vga= option when
updating with the installer):
o make sure we use long name when adding second kernel with same
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 79bb09b43..a1ec50cc2 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -113,7 +113,9 @@ my @cards = (
);
-my @devices = grep { $_->{driver} =~ /^Card:/ } detect_devices::probeall();
+my @devices;
+@devices = grep { $_->{driver} =~ /^Card:/ } detect_devices::probeall()
+ if -f '/etc/X11/xorg.conf';
# do not auto reconfigure if more than one graphic card:
$cfg{AUTORECONFIGURE_RIGHT_XORG_DRIVER} = 'no' if scalar(@devices) > 1;