summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2010-04-12 12:34:41 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2010-04-12 12:34:41 +0000
commit3b944fbec7318866a76fa4e5aec90712c3caa8fe (patch)
treeddc54f052ad2ec635a9cee9265f9596fa4412c58 /perl-install
parent02a2869f40e906e0347cd551d4f77c57bc5c5880 (diff)
downloaddrakx-3b944fbec7318866a76fa4e5aec90712c3caa8fe.tar
drakx-3b944fbec7318866a76fa4e5aec90712c3caa8fe.tar.gz
drakx-3b944fbec7318866a76fa4e5aec90712c3caa8fe.tar.bz2
drakx-3b944fbec7318866a76fa4e5aec90712c3caa8fe.tar.xz
drakx-3b944fbec7318866a76fa4e5aec90712c3caa8fe.zip
[drakboot] drop "restricted" option
It wasn't doing anything for grub, and it has the effect to *lower* the security contrary to what users may think
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm10
1 files changed, 0 insertions, 10 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index c2e3da75e..58a537467 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -394,7 +394,6 @@ 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};
@@ -439,12 +438,6 @@ sub setupBootloader__general {
$ok && $ok2;
} },
{ label => N("Password (again)"), val => \$b->{password2}, hidden => 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"));
- $ok;
- } },
{ text => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 },
]) or return 0;
} else {
@@ -485,9 +478,6 @@ 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');