summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-13 08:17:11 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-13 08:17:11 +0000
commit19082bc5482c550cb4c5cf7d68523374a3c3eeff (patch)
treeb39045bd794a81b684c22a45e9e89c9f1734f2d8
parentc7afc55244fbc0b0d3ee57c6ce83fd24b42b11c1 (diff)
downloaddrakx-19082bc5482c550cb4c5cf7d68523374a3c3eeff.tar
drakx-19082bc5482c550cb4c5cf7d68523374a3c3eeff.tar.gz
drakx-19082bc5482c550cb4c5cf7d68523374a3c3eeff.tar.bz2
drakx-19082bc5482c550cb4c5cf7d68523374a3c3eeff.tar.xz
drakx-19082bc5482c550cb4c5cf7d68523374a3c3eeff.zip
- bootloader::remove_append_dict() is not useful, bootloader::set_append() can do the same
- don't modify anything before "Ok" is clicked - set_append with $netprofile eq '' will remove parameter PROFILE=xxx, which is what we want
-rw-r--r--perl-install/any.pm3
-rw-r--r--perl-install/bootloader.pm7
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) = @_;