From aa812c40b21c70d1f20189e8be84b01f91aac4c2 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 7 Jan 2008 07:47:04 +0000 Subject: - 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 --- perl-install/NEWS | 3 +++ perl-install/bootloader.pm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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->{$_}; -- cgit v1.2.1