From 84051ad3d801c920a9c7cb129aba07d2db7501bd Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 7 Aug 2007 15:00:25 +0000
Subject: (summary) warn if the security level will prevent accessig windows
 partitions

---
 perl-install/install/NEWS                 | 1 +
 perl-install/install/steps_interactive.pm | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'perl-install')

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);
+         }
 	},
     };
 
-- 
cgit v1.2.1