diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-10-30 22:23:17 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-10-30 22:23:17 +0000 |
| commit | 8f93862e5bac6949d4f5510d5f8f056fdb02bdfc (patch) | |
| tree | 4f44437d2746268276ddbdd4158febd04dd5257c | |
| parent | 759b9eea2d659cfe3ff204c44a4dea296025967b (diff) | |
| download | drakx-8f93862e5bac6949d4f5510d5f8f056fdb02bdfc.tar drakx-8f93862e5bac6949d4f5510d5f8f056fdb02bdfc.tar.gz drakx-8f93862e5bac6949d4f5510d5f8f056fdb02bdfc.tar.bz2 drakx-8f93862e5bac6949d4f5510d5f8f056fdb02bdfc.tar.xz drakx-8f93862e5bac6949d4f5510d5f8f056fdb02bdfc.zip | |
harddrake service: do not try to reconfigure xorg driver and crash
if /etc/X11/xorg does not exist (breaks One startup)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 4 |
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; |