summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-30 15:41:51 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-30 15:41:51 +0000
commit5a016d459ea06adb0113d330cd747c00550a3a9d (patch)
tree241be366d28c054a7d462506b3f714427cd3210d
parenta579d4de6d28aa2e6e4929cbca436298db5f499d (diff)
downloaddrakx-5a016d459ea06adb0113d330cd747c00550a3a9d.tar
drakx-5a016d459ea06adb0113d330cd747c00550a3a9d.tar.gz
drakx-5a016d459ea06adb0113d330cd747c00550a3a9d.tar.bz2
drakx-5a016d459ea06adb0113d330cd747c00550a3a9d.tar.xz
drakx-5a016d459ea06adb0113d330cd747c00550a3a9d.zip
remove previous linux-nonfb entries (like done for failsafe), not to add them twice or more
-rw-r--r--perl-install/bootloader.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 845ea6758..4ed1a23d0 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1041,6 +1041,9 @@ sub suggest {
my %old_kernels = map { vmlinuz2version($_->{kernel_or_dev}) => 1 } @{$bootloader->{entries}};
@kernels = grep { !$old_kernels{$_->{version}} } @kernels;
+ #- remove existing failsafe and linux-nonfb, do not care if the previous one was modified by the user?
+ @{$bootloader->{entries}} = grep { !member($_->{label}, qw(failsafe linux-nonfb)) } @{$bootloader->{entries}};
+
foreach my $kernel (@kernels) {
my $e = add_kernel($bootloader, $kernel,
{
@@ -1054,9 +1057,6 @@ sub suggest {
}
}
- #- remove existing failsafe, do not care if the previous one was modified by the user?
- @{$bootloader->{entries}} = grep { $_->{label} ne 'failsafe' } @{$bootloader->{entries}};
-
add_kernel($bootloader, $kernels[0],
{ root => $root, label => 'failsafe', append => 'failsafe' });