summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-07 14:59:07 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-07 14:59:07 +0000
commitc29aadbbfac97a8e4e5827330a5e2987b7a63b4a (patch)
treef4e90305f8c945a64a99dd28e8a8d719c54d940b /perl-install
parent407dbaf510b26d50025bbe79f74a37de782f1189 (diff)
downloaddrakx-c29aadbbfac97a8e4e5827330a5e2987b7a63b4a.tar
drakx-c29aadbbfac97a8e4e5827330a5e2987b7a63b4a.tar.gz
drakx-c29aadbbfac97a8e4e5827330a5e2987b7a63b4a.tar.bz2
drakx-c29aadbbfac97a8e4e5827330a5e2987b7a63b4a.tar.xz
drakx-c29aadbbfac97a8e4e5827330a5e2987b7a63b4a.zip
(check_security_level) split it out of miscellaneous()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/steps_interactive.pm13
1 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index acf5fc2b4..f315507ef 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -997,6 +997,14 @@ try to force installation even if that destroys the first partition?"));
}
}
+sub check_security_level {
+ my ($o) = @_;
+ if ($o->{security} > 2 && find { $_->{fs_type} eq 'vfat' } @{$o->{fstab}}) {
+ $o->ask_okcancel('', N("In this security level, access to the files in the Windows partition is restricted to the administrator.")) or return 0;
+ }
+ return 1;
+}
+
sub miscellaneous {
my ($o, $_clicked) = @_;
@@ -1004,10 +1012,7 @@ sub miscellaneous {
require security::level;
security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user});
- if ($o->{security} > 2 && find { $_->{fs_type} eq 'vfat' } @{$o->{fstab}}) {
- $o->ask_okcancel('', N("In this security level, access to the files in the Windows partition is restricted to the administrator."))
- or goto &miscellaneous;
- }
+ check_security_level($o) or goto &miscellaneous;
}
install::steps::miscellaneous($o);