From 8f93862e5bac6949d4f5510d5f8f056fdb02bdfc Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 30 Oct 2009 22:23:17 +0000 Subject: harddrake service: do not try to reconfigure xorg driver and crash if /etc/X11/xorg does not exist (breaks One startup) --- perl-install/NEWS | 2 ++ perl-install/standalone/service_harddrake | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) 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; -- cgit v1.2.1