diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-14 12:21:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-14 12:21:17 +0000 |
| commit | f7059160ec375a03841f3d00771a0c2de4cddcfb (patch) | |
| tree | d5d79002d9aaa7ffe410b0b7ca5de80c920cb28a | |
| parent | 05a4b46180cb776d2940a562d34eeb85de9c19ee (diff) | |
| download | drakx-backup-do-not-use-f7059160ec375a03841f3d00771a0c2de4cddcfb.tar drakx-backup-do-not-use-f7059160ec375a03841f3d00771a0c2de4cddcfb.tar.gz drakx-backup-do-not-use-f7059160ec375a03841f3d00771a0c2de4cddcfb.tar.bz2 drakx-backup-do-not-use-f7059160ec375a03841f3d00771a0c2de4cddcfb.tar.xz drakx-backup-do-not-use-f7059160ec375a03841f3d00771a0c2de4cddcfb.zip | |
- don't set $o->{security} until accepted (#33567)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index edf08198b..d997a9eef 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - fix typo breaking reading fstab with UUID= entries +- don't set $o->{security} until accepted (#33567) Version 10.4.195 - 14 September 2007, by Olivier "blino" Blin diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 0be070e22..5e6c04aa0 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -952,9 +952,11 @@ sub summary { }, clicked => sub { require security::level; + my $security = $o->{security}; 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; + if (security::level::level_choose($o, \$security, \$o->{libsafe}, \$o->{security_user})) { + check_security_level($o, $security) or goto set_sec_level; + $o->{security} = $security; install::any::set_security($o); } }, @@ -1036,8 +1038,8 @@ 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}}) { + my ($o, $security) = @_; + if ($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; |