summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-24 12:28:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-24 12:28:55 +0000
commit8f687e57efcee4ff7e4161855f0cded5a64739b0 (patch)
tree3545c39f5503699ff2ab3bda8b054ece02bf9ee0
parent5954df011c059327786e862a83860307f048071a (diff)
downloaddrakx-8f687e57efcee4ff7e4161855f0cded5a64739b0.tar
drakx-8f687e57efcee4ff7e4161855f0cded5a64739b0.tar.gz
drakx-8f687e57efcee4ff7e4161855f0cded5a64739b0.tar.bz2
drakx-8f687e57efcee4ff7e4161855f0cded5a64739b0.tar.xz
drakx-8f687e57efcee4ff7e4161855f0cded5a64739b0.zip
- add DOCS (based on !excludedocs)
- set BIGMEM and SMP flags (since kernel-smp and kernel-enterprise sub-numbers are better handled by rpmsrate together with Warly's clean-rpmsrate)
-rw-r--r--perl-install/install_any.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 2cce2ee31..9f10eac6a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -362,9 +362,7 @@ sub setDefaultPackages {
push @{$o->{default_packages}}, "nfs-utils-clients" if $o->{method} eq "nfs";
push @{$o->{default_packages}}, "numlock" if $o->{miscellaneous}{numlock};
- push @{$o->{default_packages}}, "kernel-enterprise" if !$::oem && (availableRamMB() > 800) && (arch() !~ /ia64/);
push @{$o->{default_packages}}, "kernel22" if !$::oem && c::kernel_version() =~ /^\Q2.2/;
- push @{$o->{default_packages}}, "kernel-smp" if detect_devices::hasSMP();
push @{$o->{default_packages}}, "raidtools" if !is_empty_array_ref($o->{all_hds}{raids});
push @{$o->{default_packages}}, "lvm" if !is_empty_array_ref($o->{all_hds}{lvms});
push @{$o->{default_packages}}, "usbd", "hotplug" if modules::get_alias("usb-interface");
@@ -389,10 +387,13 @@ sub setDefaultPackages {
$o->{compssUsersChoice}{uc($_)} = 1 foreach grep { modules::get_that_type($_) } ('tv', 'scanner', 'photo', 'sound');
$o->{compssUsersChoice}{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
$o->{compssUsersChoice}{SYSTEM} = 1;
+ $o->{compssUsersChoice}{DOCS} = !$o->{excludedocs};
$o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners();
$o->{compssUsersChoice}{DVD} = 1 if detect_devices::dvdroms();
$o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA();
$o->{compssUsersChoice}{HIGH_SECURITY} = 1 if $o->{security} > 3;
+ $o->{compssUsersChoice}{BIGMEM} = 1 if !$::oem && (availableRamMB() > 800) && (arch() !~ /ia64/);
+ $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') ||