summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-28 02:30:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-28 02:30:27 +0000
commitaa3fa5f3892f6dbecfe00e276de6afcf75c248ef (patch)
tree0077fd30ef4e6f14924f61a2e9d0679af57d6c86
parent15fd2e7b186c835ed0a0d8137458f74ec4597645 (diff)
downloaddrakx-aa3fa5f3892f6dbecfe00e276de6afcf75c248ef.tar
drakx-aa3fa5f3892f6dbecfe00e276de6afcf75c248ef.tar.gz
drakx-aa3fa5f3892f6dbecfe00e276de6afcf75c248ef.tar.bz2
drakx-aa3fa5f3892f6dbecfe00e276de6afcf75c248ef.tar.xz
drakx-aa3fa5f3892f6dbecfe00e276de6afcf75c248ef.zip
after install, when modifying kernel parameters in all entries, skip the "failsafe" entry
(bugzilla #10143)
-rw-r--r--perl-install/bootloader.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 2b076a969..deba97c6d 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -447,7 +447,9 @@ sub get_append {
sub modify_append {
my ($b, $f) = @_;
- foreach (\$b->{perImageAppend}, map { \$_->{append} } grep { $_->{type} eq 'image' } @{$b->{entries}}) {
+ my @l = grep { $_->{type} eq 'image' && !($::isStandalone && $_->{label} eq 'failsafe') } @{$b->{entries}};
+
+ foreach (\$b->{perImageAppend}, map { \$_->{append} } @l) {
my ($simple, $dict) = unpack_append($$_);
$f->($simple, $dict);
$$_ = pack_append($simple, $dict);