summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-16 10:11:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-16 10:11:29 +0000
commit1944f6c38a27a9acb9e1afff0f16fc0b6be6e639 (patch)
tree77e3f2851f8476d93695761726dfced9385ebe56
parented3155ca30f20826bc945dd629e7bf8b92b8f096 (diff)
downloaddrakx-1944f6c38a27a9acb9e1afff0f16fc0b6be6e639.tar
drakx-1944f6c38a27a9acb9e1afff0f16fc0b6be6e639.tar.gz
drakx-1944f6c38a27a9acb9e1afff0f16fc0b6be6e639.tar.bz2
drakx-1944f6c38a27a9acb9e1afff0f16fc0b6be6e639.tar.xz
drakx-1944f6c38a27a9acb9e1afff0f16fc0b6be6e639.zip
fix auto_install graphic card configuration (when one specify the Driver)
-rw-r--r--perl-install/Xconfig/card.pm29
1 files changed, 16 insertions, 13 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 1c0e36715..cfeaa3357 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -200,22 +200,25 @@ What do you want to do?"), sub { $_[0]{text} }, \@choices) or return;
sub configure_auto_install {
my ($raw_X, $do_pkgs, $old_X, $options) = @_;
- {
- my $card = $old_X->{card} || {};
- if ($card->{card_name}) {
- #- try to get info from given card_name
- add_to_card__using_Cards($card, $card->{card_name});
- undef $card->{card_name} if !$card->{Driver}; #- bad card_name as we can not find the driver
+ my $card = $old_X->{card} || {};
+
+ if ($card->{card_name}) {
+ #- try to get info from given card_name
+ add_to_card__using_Cards($card, $card->{card_name});
+ if (!$card->{Driver}) {
+ log::l("bad card_name $card->{card_name}, using probe");
+ undef $card->{card_name};
}
- return if $card->{Driver};
}
- my @cards = probe();
- 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}{card_name}. Defaulting...');
- { Driver => $options->{allowFB} ? 'fbdev' : 'vesa' };
- };
+ if (!$card->{Driver}) {
+ my @cards = probe();
+ my ($choice) = multi_head_choices($old_X->{Xinerama}, @cards);
+ $card = $choice ? $choice->{code}() : do {
+ log::l('no graphic card probed, try providing one using $o->{card}{Driver} 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}");