summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-10 11:41:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-10 11:41:29 +0000
commit9db77ffe060ebb1e3c9dfbe1729fe39c4b1e764a (patch)
tree72d1a30dc0be58c1e8d84c6306278d3d1b1bd41e /perl-install
parent3060e385977d0b6b3d9facdf2bb8a0bf417800f0 (diff)
downloaddrakx-backup-do-not-use-9db77ffe060ebb1e3c9dfbe1729fe39c4b1e764a.tar
drakx-backup-do-not-use-9db77ffe060ebb1e3c9dfbe1729fe39c4b1e764a.tar.gz
drakx-backup-do-not-use-9db77ffe060ebb1e3c9dfbe1729fe39c4b1e764a.tar.bz2
drakx-backup-do-not-use-9db77ffe060ebb1e3c9dfbe1729fe39c4b1e764a.tar.xz
drakx-backup-do-not-use-9db77ffe060ebb1e3c9dfbe1729fe39c4b1e764a.zip
choose a not-to-bad default when X auto config fails in auto install
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Xconfig/card.pm7
1 files changed, 5 insertions, 2 deletions
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}");