From 9db77ffe060ebb1e3c9dfbe1729fe39c4b1e764a Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 10 Nov 2003 11:41:29 +0000 Subject: choose a not-to-bad default when X auto config fails in auto install --- perl-install/Xconfig/card.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'perl-install/Xconfig') diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index f63787966..5ef15cea5 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -263,8 +263,11 @@ sub configure_auto_install { } my @cards = probe(); - my ($choice) = multi_head_choices($old_X->{Xinerama}, @cards) or log::l('no graphic card probed, try providing one using $o->{card}{Driver} or $o->{card}{server} or $o->{card}{card_name}'), return; - my $card = $choice->{code}(); + my ($choice) = multi_head_choices($old_X->{Xinerama}, @cards); + my $card = $choice ? $choice->{code}() : do { + log::l('no graphic card probed, try providing one using $o->{card}{Driver} or $o->{card}{server} or $o->{card}{card_name}. Defaulting...'); + { Driver => ($options->{allowFB} ? 'fbdev' : 'vesa') }; + }; my ($glx_choice) = xfree_and_glx_choices($card); log::l("Using $glx_choice->{text}"); -- cgit v1.2.1