From 44a5ab88960b456c92b6a2ff1fcf7c000abb1372 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 13 Mar 2006 09:57:10 +0000 Subject: call expand_entry_symlinks() before comparing with same_entries() (bugzilla #21566) --- perl-install/bootloader.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 348c3972e..93f3215c1 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -447,6 +447,9 @@ sub add_entry { if ($conflicting) { #- replacing $conflicting with $to_add @{$bootloader->{entries}} = map { $_ == $conflicting ? $to_add : $_ } @{$bootloader->{entries}}; + + #- we will keep $conflicting, but not with same symlinks if used by the entry to add + expand_entry_symlinks($bootloader, $conflicting); } else { #- we have found an unused label push @{$bootloader->{entries}}, $to_add; @@ -459,7 +462,6 @@ sub add_entry { $to_add = $conflicting; if ($to_add->{label} eq 'linux') { - expand_entry_symlinks($bootloader, $to_add); $label = kernel_str2label(vmlinuz2kernel_str($to_add->{kernel_or_dev}), 'use_long_name'); } else { $label =~ s/^alt\d*_//; -- cgit v1.2.1