summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-29 16:49:51 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-29 16:49:51 +0000
commitfe517daec233fb7dcdd171468cc973ce058d8d08 (patch)
treee20834eb3be09e98d6624e18327fe747fc74fea6 /perl-install
parentbae54d952aea78b56b504799ca7f63ec2bae4ad4 (diff)
downloaddrakx-fe517daec233fb7dcdd171468cc973ce058d8d08.tar
drakx-fe517daec233fb7dcdd171468cc973ce058d8d08.tar.gz
drakx-fe517daec233fb7dcdd171468cc973ce058d8d08.tar.bz2
drakx-fe517daec233fb7dcdd171468cc973ce058d8d08.tar.xz
drakx-fe517daec233fb7dcdd171468cc973ce058d8d08.zip
(level_choose) refresh "Security" step
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/security/level.pm10
2 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index de7f80b1d..9b5b67f37 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- do not try starting graphical installer on early i810 (which is is
not supported), thus prevent waiting several minutes needlessly
- refresh "Individual package selection" step
+- refresh "Security" step
Version 11.28 - 28 August 2008
diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm
index 198427eff..ae5e30db2 100644
--- a/perl-install/security/level.pm
+++ b/perl-install/security/level.pm
@@ -53,15 +53,17 @@ connections from many clients. Note: if your machine is only a client on the Int
my @l = 2 .. 5;
$in->ask_from_({ title => $::isInstall ? N("Security") : N("DrakSec Basic Options"),
- messages => N("Please choose the desired security level") . "\n\n" .
- join('', map { to_string($_) . ": " . formatAlaTeX($help{$_}) . "\n\n" } @l),
interactive_help_id => 'miscellaneous',
}, [
- { label => N("Security level"), val => $security, list => \@l, format => \&to_string },
+ { label => N("Please choose the desired security level"), title => 1 },
+ { val => $security, list => \@l, format => \&to_string,
+ format => sub { warn ">>$_\n"; N("%s: %s", to_string($_), formatAlaTeX($help{$_})) },
+ type => 'list', gtk => { use_boxradio => 1 } },
if_($in->do_pkgs->is_installed('libsafe') && arch() =~ /^i.86/,
{ label => N("Use libsafe for servers"), val => $libsafe, type => 'bool', text =>
N("A library which defends against buffer overflow and format string attacks.") }),
- { label => N("Security Administrator (login or email)"), val => $email, },
+ { label => N("Security Administrator:"), title => 1 },
+ { label => N("Login or email:"), val => $email, },
],
);
}