diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-21 22:33:45 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-21 22:33:45 +0000 |
| commit | 4e40de3afa90688347153a85a194265a171bb621 (patch) | |
| tree | 21af8d47b9a81c41aef4725901e324be69b01753 | |
| parent | c020e0d68c686866bf56cdb5990d6ea307e11295 (diff) | |
| download | drakx-backup-do-not-use-4e40de3afa90688347153a85a194265a171bb621.tar drakx-backup-do-not-use-4e40de3afa90688347153a85a194265a171bb621.tar.gz drakx-backup-do-not-use-4e40de3afa90688347153a85a194265a171bb621.tar.bz2 drakx-backup-do-not-use-4e40de3afa90688347153a85a194265a171bb621.tar.xz drakx-backup-do-not-use-4e40de3afa90688347153a85a194265a171bb621.zip | |
fix multi-head auto-choosing in auto install
| -rw-r--r-- | perl-install/Xconfigurator.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 198d390c3..df67350e9 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -392,7 +392,8 @@ sub card_config { if (!$card->{server} && !$card->{driver} && !$noauto) { my @cards = probe_cards(); - my $card_ = multi_head_choose($in, $noauto, @cards) or return; + my $card_ = $in->isa('class_discard') ? $cards[0] : + multi_head_choose($in, $noauto, @cards) or return; put_in_hash($card, $card_); $card->{server} = 'FBDev' if $cardOptions->{allowFB} && !$card->{server} && !$card->{driver}; @@ -915,7 +916,7 @@ sub resolutionsConfiguration { #- there could be a problem. #- memory in KB is approximated by $x_res*$dpeth/14 which is little less #- than memory really used, (correct factor is 13.65333 for w/h ratio of 1.33333). - if (!$x_res || $auto && ref($in) !~ /class_discard/ && ($x_res < 1024 && ($card->{VideoRam} / ($x_res * $depth / 14)) > 2)) { + if (!$x_res || $auto && !$in->isa('class_discard') && ($x_res < 1024 && ($card->{VideoRam} / ($x_res * $depth / 14)) > 2)) { delete $card->{depth}; return resolutionsConfiguration($in, $X); } |