summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2010-04-12 12:34:45 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2010-04-12 12:34:45 +0000
commitb0f1bfa7e23ce289faacd38356b62600d34d2e5a (patch)
tree73f01e40e41244d6ecbabbd094e37523437e66a5 /perl-install
parentbbe307e45ae9195f78fc8e9c5abcb77019394ac2 (diff)
downloaddrakx-b0f1bfa7e23ce289faacd38356b62600d34d2e5a.tar
drakx-b0f1bfa7e23ce289faacd38356b62600d34d2e5a.tar.gz
drakx-b0f1bfa7e23ce289faacd38356b62600d34d2e5a.tar.bz2
drakx-b0f1bfa7e23ce289faacd38356b62600d34d2e5a.tar.xz
drakx-b0f1bfa7e23ce289faacd38356b62600d34d2e5a.zip
[drakboot] add per-boot-entry lock with password checkbox
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm1
-rw-r--r--perl-install/bootloader.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 58a537467..5e11c7aa5 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -533,6 +533,7 @@ sub setupBootloader__entries {
if_($e->{xen},
{ label => N("Xen append"), val => \$e->{xen_append} }
),
+ if_($b->{password}, { label => N("Requires password to boot"), val => \$e->{lock}, type => "bool"}),
if_(arch() !~ /ppc|ia64/,
{ label => N("Video mode"), val => \$vga, list => [ '', Xconfig::resolution_and_depth::bios_vga_modes() ], format => \&Xconfig::resolution_and_depth::to_string, advanced => 1 },
),
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index cb953e801..52ecdc89f 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1448,6 +1448,7 @@ sub write_lilo {
push @entry_conf, "append=" . $quotes->($append) if $append;
push @entry_conf, "vga=$entry->{vga}" if $entry->{vga};
push @entry_conf, grep { $entry->{$_} } qw(read-write read-only optional);
+ push @entry_conf, "mandatory" if $entry->{lock};
} else {
delete $entry->{unsafe} if $entry->{table}; #- we can't have both
push @entry_conf, map { "$_=$entry->{$_}" } grep { $entry->{$_} } qw(table boot-as);