diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-02-06 10:02:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-02-06 10:02:18 +0000 |
| commit | e66b9088c73f728c35d20bf267933fefffc2e7b8 (patch) | |
| tree | ed35c587436ee14b4a51737987fea4c0984e2322 /perl-install/Xconfig | |
| parent | 3620f303035b23ac095119a6f1367f61e0440ee5 (diff) | |
| download | drakx-backup-do-not-use-e66b9088c73f728c35d20bf267933fefffc2e7b8.tar drakx-backup-do-not-use-e66b9088c73f728c35d20bf267933fefffc2e7b8.tar.gz drakx-backup-do-not-use-e66b9088c73f728c35d20bf267933fefffc2e7b8.tar.bz2 drakx-backup-do-not-use-e66b9088c73f728c35d20bf267933fefffc2e7b8.tar.xz drakx-backup-do-not-use-e66b9088c73f728c35d20bf267933fefffc2e7b8.zip | |
don't test X config if using driver vmware (bugzilla #5346)
Diffstat (limited to 'perl-install/Xconfig')
| -rw-r--r-- | perl-install/Xconfig/card.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 465d74907..2759c6563 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -559,7 +559,7 @@ sub check_bad_card { my ($card) = @_; my $bad_card = using_xf4($card) ? $card->{BAD_FB_RESTORE} : $card->{BAD_FB_RESTORE_XF3}; $bad_card ||= $card->{Driver} eq 'i810' || $card->{Driver} eq 'fbdev'; - $bad_card ||= $card->{Driver} eq 'nvidia' if !$::isStandalone; #- avoid testing during install at any price. + $bad_card ||= member($card->{Driver}, 'nvidia', 'vmware') if !$::isStandalone; #- avoid testing during install at any price. $bad_card ||= $card->{server} =~ /FBDev|Sun/ if !using_xf4($card); log::l("the graphics card does not like X in framebuffer") if $bad_card; |