From e539364dc1bbd8bd5afa29877bfd392154e5c488 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 11 Apr 2005 12:03:36 +0000 Subject: 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) --- perl-install/bootloader.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install/bootloader.pm') 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; } -- cgit v1.2.1