summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-06 07:55:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-06 07:55:53 +0000
commit2fd00801727c1a81085d88879b8ff30a5162925c (patch)
treeb3eca261c372565bb0b05a84d27062cdb30305da
parent9f4cf7936cee9719b5c6adc95f8f9fac56065a94 (diff)
downloaddrakx-2fd00801727c1a81085d88879b8ff30a5162925c.tar
drakx-2fd00801727c1a81085d88879b8ff30a5162925c.tar.gz
drakx-2fd00801727c1a81085d88879b8ff30a5162925c.tar.bz2
drakx-2fd00801727c1a81085d88879b8ff30a5162925c.tar.xz
drakx-2fd00801727c1a81085d88879b8ff30a5162925c.zip
don't succeed automatic configuration (not auto_install) when there is many cards (as requested by Joe Bolin on cooker)
-rw-r--r--perl-install/Xconfig/card.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 2cb8dc1f6..7c858589b 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -178,7 +178,9 @@ sub multi_head_choose {
my @choices = multi_head_choices('', @cards);
my $tc = $choices[0];
- if (!$auto) {
+ if ($auto) {
+ @choices == 1 or return;
+ } else {
$tc = $in->ask_from_listf(N("Multi-head configuration"),
N("Your system supports multiple head configuration.
What do you want to do?"), sub { $_[0]{text} }, \@choices) or return;