summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-21 13:22:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-21 13:22:14 +0000
commite3275325538d5902c31d2604f66162837fe60317 (patch)
treefd1612558884b742f321c4aa1505aa9e1e4b53f9
parent0393a451af5eff8edf4b944c97b05fead8802b16 (diff)
downloaddrakx-backup-do-not-use-e3275325538d5902c31d2604f66162837fe60317.tar
drakx-backup-do-not-use-e3275325538d5902c31d2604f66162837fe60317.tar.gz
drakx-backup-do-not-use-e3275325538d5902c31d2604f66162837fe60317.tar.bz2
drakx-backup-do-not-use-e3275325538d5902c31d2604f66162837fe60317.tar.xz
drakx-backup-do-not-use-e3275325538d5902c31d2604f66162837fe60317.zip
add HIGH_SECURITY flag, use it for libsafe and kernel22-secure
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/share/rpmsrate2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 2a5e591ab..d35877bba 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -334,7 +334,6 @@ sub setPackages {
push @{$o->{default_packages}}, "numlock" if $o->{miscellaneous}{numlock};
push @{$o->{default_packages}}, "kernel-enterprise" if (availableRamMB() > 800) && (arch() !~ /ia64/);
push @{$o->{default_packages}}, "kernel22" if c::kernel_version() =~ /^\Q2.2/;
- push @{$o->{default_packages}}, "kernel22-secure" if $o->{security} > 3;
push @{$o->{default_packages}}, "kernel-smp" if detect_devices::hasSMP();
push @{$o->{default_packages}}, "kernel-pcmcia-cs" if $o->{pcmcia};
push @{$o->{default_packages}}, "raidtools" if !is_empty_array_ref($o->{all_hds}{raids});
@@ -373,6 +372,7 @@ sub setPackages {
$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}{'3D'} = 1 if
detect_devices::matching_desc('Matrox.* G[245][05]0') ||
detect_devices::matching_desc('Riva.*128') ||
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 0ea308d74..0d7828f71 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -480,6 +480,8 @@ SYSTEM
linux_logo locales man-pages iputils
urpmi cpio
+ 5 HIGH_SECURITY libsafe kernel22-secure
+
4 sndconfig ftp ftp-client-krb5 gpm hexedit strace mandrake-mime
3 bc