diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-04-11 12:03:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-04-11 12:03:36 +0000 |
| commit | e539364dc1bbd8bd5afa29877bfd392154e5c488 (patch) | |
| tree | fe3d41fc44fe7a093aa88ccb6d520576896c025f | |
| parent | cedd8898892dd1717bd98ed2917a03a31b1b45c1 (diff) | |
| download | drakx-backup-do-not-use-e539364dc1bbd8bd5afa29877bfd392154e5c488.tar drakx-backup-do-not-use-e539364dc1bbd8bd5afa29877bfd392154e5c488.tar.gz drakx-backup-do-not-use-e539364dc1bbd8bd5afa29877bfd392154e5c488.tar.bz2 drakx-backup-do-not-use-e539364dc1bbd8bd5afa29877bfd392154e5c488.tar.xz drakx-backup-do-not-use-e539364dc1bbd8bd5afa29877bfd392154e5c488.zip | |
fix setting perImageAppend to default entry {append}
(it was buggy when the default entry had an empty append, making perImageAppend be failsafe on amd64 upgrade)
| -rw-r--r-- | perl-install/bootloader.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index ecdc9f2f1..d64d6d118 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -179,9 +179,10 @@ sub read { if ($type eq $main_method) { my @prefered_entries = map { get_label($_, $bootloader) } $bootloader->{default}, 'linux'; - if (my $default = find { $_ && $_->{append} } (@prefered_entries, @{$bootloader->{entries}})) { + if (my $default = find { $_ && $_->{type} eq 'image' } (@prefered_entries, @{$bootloader->{entries}})) { $bootloader->{default_vga} = $default->{vga}; $bootloader->{perImageAppend} ||= $default->{append}; + log::l("perImageAppend is now $bootloader->{perImageAppend}"); } return $bootloader; } |