summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2010-04-12 12:34:40 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2010-04-12 12:34:40 +0000
commit02a2869f40e906e0347cd551d4f77c57bc5c5880 (patch)
tree03c3bd8b1587def0816097d5e7ae7f55cbe9618a /perl-install/any.pm
parent16197e1fa9b366d700d918d4832522075bd9af0c (diff)
downloaddrakx-02a2869f40e906e0347cd551d4f77c57bc5c5880.tar
drakx-02a2869f40e906e0347cd551d4f77c57bc5c5880.tar.gz
drakx-02a2869f40e906e0347cd551d4f77c57bc5c5880.tar.bz2
drakx-02a2869f40e906e0347cd551d4f77c57bc5c5880.tar.xz
drakx-02a2869f40e906e0347cd551d4f77c57bc5c5880.zip
remember "restricted" setting in drakboot
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 0b2d0fb8d..c2e3da75e 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -394,6 +394,7 @@ sub setupBootloader__general {
my $prev_enable_apic = my $enable_apic = !bootloader::get_append_simple($b, 'noapic');
my $prev_enable_lapic = my $enable_lapic = !bootloader::get_append_simple($b, 'nolapic');
my $prev_enable_smp = my $enable_smp = !bootloader::get_append_simple($b, 'nosmp');
+ my $prev_enable_restricted = my $enable_restricted = !bootloader::get_append_simple($b, 'restricted');
my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
my $prev_boot = $b->{boot};
my $prev_method = $b->{method};
@@ -438,7 +439,7 @@ sub setupBootloader__general {
$ok && $ok2;
} },
{ label => N("Password (again)"), val => \$b->{password2}, hidden => 1 },
- { text => N("Restrict command line options"), val => \$b->{restricted}, type => "bool", advanced => 1,
+ { text => N("Restrict command line options"), val => \$enable_restricted, type => "bool", advanced => 1,
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"));
@@ -484,6 +485,9 @@ sub setupBootloader__general {
if ($prev_enable_smp != $enable_smp) {
($enable_smp ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'nosmp');
}
+ if ($prev_enable_restricted != $enable_restricted) {
+ ($enable_restricted ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'restricted');
+ }
if ($prev_enable_apic != $enable_apic) {
($enable_apic ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'noapic');