summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-02-03 23:37:53 +0000
committerThierry Vignaud <tv@mandriva.org>2010-02-03 23:37:53 +0000
commit9756c3af6dd933e24f5d3e343cea9449e32564a8 (patch)
tree12c2d585cd7acaa4c345a1d02d5022e8963febc2
parentb727c5b5b29d0f6b8963c59b9511927727d38389 (diff)
downloaddrakx-backup-do-not-use-9756c3af6dd933e24f5d3e343cea9449e32564a8.tar
drakx-backup-do-not-use-9756c3af6dd933e24f5d3e343cea9449e32564a8.tar.gz
drakx-backup-do-not-use-9756c3af6dd933e24f5d3e343cea9449e32564a8.tar.bz2
drakx-backup-do-not-use-9756c3af6dd933e24f5d3e343cea9449e32564a8.tar.xz
drakx-backup-do-not-use-9756c3af6dd933e24f5d3e343cea9449e32564a8.zip
(setupBootloader__general) always display security settings
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9bd9a5955..aac16d1ed 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o always display security settings
+
Version 13.5 - 26 January 2010
- drakboot:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index c73d6153f..bfd403aed 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -419,7 +419,6 @@ sub setupBootloader__general {
{ text => N("Enable SMP"), val => \$enable_smp, type => 'bool', advanced => 1 },
{ text => N("Enable APIC"), val => \$enable_apic, type => 'bool', advanced => 1, disabled => sub { !$enable_lapic } },
{ text => N("Enable Local APIC"), val => \$enable_lapic, type => 'bool', advanced => 1 },
- if_($security >= 2 || $b->{password} || $b->{restricted},
{ label => N("Password"), val => \$b->{password}, hidden => 1,
validate => sub {
my $ok = $b->{password} eq $b->{password2} or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]);
@@ -429,7 +428,6 @@ sub setupBootloader__general {
{ label => N("Password (again)"), val => \$b->{password2}, hidden => 1 },
{ text => N("Restrict command line options"), val => \$b->{restricted}, type => "bool", text => N("restrict"),
validate => sub { my $ok = !$b->{restricted} || $b->{password} or $in->ask_warn('', N("Option ``Restrict command line options'' is of no use without a password")); $ok } },
- ),
{ text => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 },
]) or return 0;
} else {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b1cae1f8e..26740e0c9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader configuration:
+ o always display security settings
+
Version 13.8 - 3 February 2010
- fixed logo