summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-03-01 15:09:57 +0000
committerFrancois Pons <fpons@mandriva.com>2002-03-01 15:09:57 +0000
commitcaf0ea1689e1a2c1c2c979d40818ca59329aa4f4 (patch)
treea3a1776612a954be30e718bd93ae7ede4f9781bc
parentfb6222d332a7d5122baa6ec22d0f3ccbb994570c (diff)
downloaddrakx-caf0ea1689e1a2c1c2c979d40818ca59329aa4f4.tar
drakx-caf0ea1689e1a2c1c2c979d40818ca59329aa4f4.tar.gz
drakx-caf0ea1689e1a2c1c2c979d40818ca59329aa4f4.tar.bz2
drakx-caf0ea1689e1a2c1c2c979d40818ca59329aa4f4.tar.xz
drakx-caf0ea1689e1a2c1c2c979d40818ca59329aa4f4.zip
removed some card where 3D is not installed by default:
Riva128, Radeon 8500 and Rage Mobility card.
-rw-r--r--perl-install/install_any.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index c3dc8b1d9..bdcba629d 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -41,7 +41,8 @@ my $cdrom = undef;
sub useMedium($) {
#- before ejecting the first CD, there are some files to copy!
#- does nothing if the function has already been called.
- $_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
+ #$_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
+ $_[0] > 1 and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
$asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'");
$asked_medium = $_[0];
@@ -366,15 +367,13 @@ sub setDefaultPackages {
$o->{compssUsersChoice}{SMP} = 1 if detect_devices::hasSMP();
$o->{compssUsersChoice}{'3D'} = 1 if
detect_devices::matching_desc('Matrox.* G[245][05]0') ||
- detect_devices::matching_desc('Riva.*128') ||
detect_devices::matching_desc('Rage X[CL]') ||
- detect_devices::matching_desc('Rage Mobility [PL]') ||
detect_devices::matching_desc('3D Rage (?:LT|Pro)') ||
detect_devices::matching_desc('Voodoo [35]') ||
detect_devices::matching_desc('Voodoo Banshee') ||
detect_devices::matching_desc('8281[05].* CGC') ||
detect_devices::matching_desc('Rage 128') ||
- detect_devices::matching_desc('Radeon ') ||
+ detect_devices::matching_desc('Radeon ') && !detect_devices::matching_desc('Radeon 8500') ||
detect_devices::matching_desc('[nN]Vidia.*T[nN]T2') || #- TNT2 cards
detect_devices::matching_desc('[nN]Vidia.*NV[56]') ||
detect_devices::matching_desc('[nN]Vidia.*Vanta') ||