summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-07 07:47:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-07 07:47:04 +0000
commitaa812c40b21c70d1f20189e8be84b01f91aac4c2 (patch)
treef266ef2f12d449d894b0fad7fd553c7903f3431a
parenta45e6b68b89ae7485903eadb8928bcdfe900e35e (diff)
downloaddrakx-aa812c40b21c70d1f20189e8be84b01f91aac4c2.tar
drakx-aa812c40b21c70d1f20189e8be84b01f91aac4c2.tar.gz
drakx-aa812c40b21c70d1f20189e8be84b01f91aac4c2.tar.bz2
drakx-aa812c40b21c70d1f20189e8be84b01f91aac4c2.tar.xz
drakx-aa812c40b21c70d1f20189e8be84b01f91aac4c2.zip
- bootloader-config:
o fix regression introduced in 10.5.7: do not create alt_xxx entries when adding a new entry in bootloader nb: bug introduced by {verbatim} entry field, reported by Andrey on cooker mailing list
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d164ed766..25f8ff99e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- bootloader-config:
+ o fix regression introduced in 10.5.7: do not create alt_xxx entries when
+ adding a new entry in bootloader
- harddrake:
o allow to set zero values in module options (#26515)
o make "Run config tool" available again (#34794)
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 5033f1a0b..2d182e3bb 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -474,7 +474,7 @@ sub same_entries {
my ($a, $b) = @_;
foreach (uniq(keys %$a, keys %$b)) {
- if (member($_, 'label', 'append', 'mapdrive', 'readonly', 'makeactive')) {
+ if (member($_, 'label', 'append', 'mapdrive', 'readonly', 'makeactive', 'verbatim')) {
next;
} else {
next if $a->{$_} eq $b->{$_};