summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-07 15:13:24 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-07 15:13:24 +0000
commit5ce8e586c5a658e47d1edfe556dd4478f552689b (patch)
tree15d41c71e528202449fc9a124a73d297c9dbce4d
parent84051ad3d801c920a9c7cb129aba07d2db7501bd (diff)
downloaddrakx-5ce8e586c5a658e47d1edfe556dd4478f552689b.tar
drakx-5ce8e586c5a658e47d1edfe556dd4478f552689b.tar.gz
drakx-5ce8e586c5a658e47d1edfe556dd4478f552689b.tar.bz2
drakx-5ce8e586c5a658e47d1edfe556dd4478f552689b.tar.xz
drakx-5ce8e586c5a658e47d1edfe556dd4478f552689b.zip
silently set the default security level as 3
-rw-r--r--perl-install/install/steps_interactive.pm2
-rw-r--r--perl-install/install/steps_list.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index f01bfaf06..e40f19eb0 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -1011,7 +1011,7 @@ sub check_security_level {
sub miscellaneous {
my ($o, $_clicked) = @_;
- if ($o->{meta_class} ne 'desktop' && $o->{meta_class} ne 'firewall' && !$o->{isUpgrade}) {
+ if (0 && $o->{meta_class} ne 'desktop' && $o->{meta_class} ne 'firewall' && !$o->{isUpgrade}) {
require security::level;
security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user});
diff --git a/perl-install/install/steps_list.pm b/perl-install/install/steps_list.pm
index 75bd15cd7..814fae0a4 100644
--- a/perl-install/install/steps_list.pm
+++ b/perl-install/install/steps_list.pm
@@ -19,7 +19,7 @@ use common;
setupSCSI => [ N_("_: Keep these entry short\nHard drive detection"), 1, 0, '1', '' ],
selectInstallClass => [ N_("_: Keep these entry short\nInstallation class"), 1, 1, '1', '' ],
selectKeyboard => [ N_("_: Keep these entry short\nKeyboard"), 1, 1, '1' ],
- #miscellaneous => [ N_("_: Keep these entry short\nSecurity"), 1, 1, '', '' ],
+ miscellaneous => [ N_("_: Keep these entry short\nSecurity"), 1, 1, '1', '' ],
doPartitionDisks => [ N_("_: Keep these entry short\nPartitioning"), 1, 0, '', "selectInstallClass" ],
formatPartitions => [ N_("_: Keep these entry short\nFormatting"), 1, -1, '1', "doPartitionDisks" ],
choosePackages => [ N_("_: Keep these entry short\nChoosing packages"), 1, -2, '1', "formatPartitions" ],