diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/any.pm | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 5d1388dc8..3eef8f478 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -286,7 +286,6 @@ sub setupBootloader__entries { my $default = my $old_default = $e->{label} eq $b->{default}; my $vga = Xconfig::resolution_and_depth::from_bios($e->{vga}); my $netprofile = bootloader::get_append($b, 'PROFILE'); - bootloader::remove_append_dict($b, 'PROFILE'); #- hide PROFILE option in 'append' text entry my @l; if ($e->{type} eq "image") { @@ -337,7 +336,7 @@ sub setupBootloader__entries { $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default}; $e->{vga} = ref($vga) ? $vga->{bios} : $vga; - bootloader::set_append($b, 'PROFILE', $netprofile) if $netprofile; + bootloader::set_append($b, PROFILE => $netprofile); bootloader::configure_entry($e); #- hack to make sure initrd file are built. 1; }; diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 9a84dece1..7defe84da 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -508,13 +508,6 @@ sub remove_append_simple { @$simple = grep { $_ ne $key } @$simple; }); } -sub remove_append_dict { - my ($b, $key) = @_; - modify_append($b, sub { - my ($simple, $_dict) = @_; - @$_dict = grep { $_->[0] ne $key } @$_dict; - }); -} sub set_append { my $has_val = @_ > 2; my ($b, $key, $val) = @_; |