summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-07 20:29:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-07 20:29:08 +0000
commit7adaee28ae783f618ba2b271963423f18df94de0 (patch)
tree80b640c006aaedef56bd7b15902f13785bcfccd4
parent4aaa5ac7b90f200169d1d8392e52d0121918702d (diff)
downloaddrakx-7adaee28ae783f618ba2b271963423f18df94de0.tar
drakx-7adaee28ae783f618ba2b271963423f18df94de0.tar.gz
drakx-7adaee28ae783f618ba2b271963423f18df94de0.tar.bz2
drakx-7adaee28ae783f618ba2b271963423f18df94de0.tar.xz
drakx-7adaee28ae783f618ba2b271963423f18df94de0.zip
(configure): do not do card_config__not_listed in $auto mode
-rw-r--r--perl-install/Xconfig/card.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 968746f72..a2474e035 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -274,10 +274,12 @@ sub configure {
my @cards = probe();
@cards or @cards = {};
- if (!$cards[0]{server} && !$cards[0]{Driver}) {
- return if $auto;
+ if ($auto) {
+ return 0 if !$cards[0]{server} && !$cards[0]{Driver};
+ } else {
card_config__not_listed($in, $cards[0], $options) or return;
}
+
my $card = multi_head_choose($in, $auto, @cards) or return;
$card->{Driver} = 'fbdev' if $options->{allowFB} && !$card->{server} && !$card->{Driver};