summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps_interactive.pm7
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4debc2540..9cef1af5d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
- kill security level step (only reachable from summary now)
- restore progress bar when formatting ext3
- summary screen:
+ o warn if the security level will prevent accessig windows partitions
o reorder steps according to specs
o render titles in bold
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index f315507ef..f01bfaf06 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -898,8 +898,11 @@ sub summary {
},
clicked => sub {
require security::level;
- security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user})
- and install::any::set_security($o);
+ set_sec_level:
+ if (security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user})) {
+ check_security_level($o) or goto set_sec_level;
+ install::any::set_security($o);
+ }
},
};