summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-11-30 18:03:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-11-30 18:03:12 +0000
commit7da2d2002e5e7cf6a43d92e8847299ccdc08e2f7 (patch)
tree10aed4c5e1d6e9fb681174857d6eed745752322e
parent6ac26c2948ede4d2e24e732e66f0e5aeb785267e (diff)
downloaddrakx-7da2d2002e5e7cf6a43d92e8847299ccdc08e2f7.tar
drakx-7da2d2002e5e7cf6a43d92e8847299ccdc08e2f7.tar.gz
drakx-7da2d2002e5e7cf6a43d92e8847299ccdc08e2f7.tar.bz2
drakx-7da2d2002e5e7cf6a43d92e8847299ccdc08e2f7.tar.xz
drakx-7da2d2002e5e7cf6a43d92e8847299ccdc08e2f7.zip
- bootloader-config:
o do not drop entries "failsafe" and "linux-nonfb" when removing a kernel
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/bootloader-config4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 372b3a345..3fa9e8bb7 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- bootloader-config:
+ o do not drop entries "failsafe" and "linux-nonfb" when removing a kernel
- localedrake:
o adapt to cooker: scim-tables-skim is now skim-scim-tables
o restrict the proposed input-methods for each language
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 8665a46e3..51bfe58ed 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -111,8 +111,10 @@ sub remove_kernel() {
}
if (my $kernel_str = $proposed_labels{$_->{label}}) {
push @new_entries, [ $kernel_str, $_ ];
+ 1;
+ } else {
+ 0;
}
- 1;
} else {
0;
}