diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-04-05 08:02:32 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-04-05 08:02:32 +0000 |
| commit | 9eb679e92c96ca1dc4e14611a44c8a654b3c567e (patch) | |
| tree | e92dda080c00ca30058268e8b2fbca1bc7dc843a | |
| parent | 6890035060184dead852fd237833073ef975e994 (diff) | |
| download | drakx-9eb679e92c96ca1dc4e14611a44c8a654b3c567e.tar drakx-9eb679e92c96ca1dc4e14611a44c8a654b3c567e.tar.gz drakx-9eb679e92c96ca1dc4e14611a44c8a654b3c567e.tar.bz2 drakx-9eb679e92c96ca1dc4e14611a44c8a654b3c567e.tar.xz drakx-9eb679e92c96ca1dc4e14611a44c8a654b3c567e.zip | |
apply patch from bugzilla #15216, adding support for "password=..." and "restricted" at per-entry level (thanks to jarfil)
| -rw-r--r-- | perl-install/bootloader.pm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index b1f2ef632..ecdc9f2f1 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1044,6 +1044,9 @@ sub write_lilo { #- normalize: RESTRICTED is only valid if PASSWORD is set delete $bootloader->{restricted} if !$bootloader->{password}; + foreach my $entry (@{$bootloader->{entries}}) { + delete $entry->{restricted} if !$entry->{password} && !$bootloader->{password}; + } if (!get_label($bootloader->{default}, $bootloader)) { log::l("default bootloader entry $bootloader->{default} is invalid, choose another one"); @@ -1097,6 +1100,9 @@ sub write_lilo { push @entry_conf, map_each { "map-drive=$::a", " to=$::b" } %{$entry->{mapdrive}}; } } + push @entry_conf, "password=$entry->{password}" if $entry->{password}; + push @entry_conf, "restricted" if $entry->{restricted}; + push @conf, map { "\t$_" } @entry_conf; } my $f = arch() =~ /ia64/ ? "$::prefix/boot/efi/elilo.conf" : "$::prefix/etc/lilo.conf"; |