summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-16 12:43:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-16 12:43:36 +0000
commitb4955db27bf8703e7088da788a9f15c0c96ae2a4 (patch)
tree1d73b99b501a2bf5c1c00d3fa76efefc8a46bb44
parentcbeb27e8f884eaa0fdc9abe84b1b8789157d2a61 (diff)
downloaddrakx-b4955db27bf8703e7088da788a9f15c0c96ae2a4.tar
drakx-b4955db27bf8703e7088da788a9f15c0c96ae2a4.tar.gz
drakx-b4955db27bf8703e7088da788a9f15c0c96ae2a4.tar.bz2
drakx-b4955db27bf8703e7088da788a9f15c0c96ae2a4.tar.xz
drakx-b4955db27bf8703e7088da788a9f15c0c96ae2a4.zip
ask security level in every install
-rw-r--r--perl-install/install_steps_interactive.pm7
-rw-r--r--perl-install/steps.pm2
2 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a2be95bc5..6027828b7 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1108,10 +1108,9 @@ try to force installation even if that destroys the first partition?"));
sub miscellaneous {
my ($o, $_clicked) = @_;
- if ($::expert) {
- require security::level;
- security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user}) or return;
- }
+ require security::level;
+ security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user}) or return;
+
install_steps::miscellaneous($o);
}
diff --git a/perl-install/steps.pm b/perl-install/steps.pm
index 97aa2de35..d1718aa55 100644
--- a/perl-install/steps.pm
+++ b/perl-install/steps.pm
@@ -16,7 +16,7 @@ use common;
setupSCSI => [ N_("Hard drive detection"), 1, 0, '', '', 'harddrive' ],
selectInstallClass => [ N_("Select installation class"), 1, 1, '', '', '' ],
selectKeyboard => [ N_("Choose your keyboard"), 1, 1, '', "selectInstallClass", 'keyboard' ],
- miscellaneous => [ N_("Security"), 1, 1, '!$::expert', '', 'security' ],
+ miscellaneous => [ N_("Security"), 1, 1, '', '', 'security' ],
doPartitionDisks => [ N_("Setup filesystems"), 1, 0, '', "selectInstallClass", 'partition' ],
formatPartitions => [ N_("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", 'partition' ],
choosePackages => [ N_("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'partition' ],