Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2014-09-17 21:23:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2014-08-27 16:53:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2014-09-17 21:23:32.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 16 10:36:10 CEST 2014 - [email protected] + +- join byid and kern maps instead of picking one (bnc #896665) +- 0.822 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.821.tar.xz New: ---- perl-Bootloader-0.822.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.kbe3vA/_old 2014-09-17 21:23:33.000000000 +0200 +++ /var/tmp/diff_new_pack.kbe3vA/_new 2014-09-17 21:23:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.821 +Version: 0.822 Release: 0 Requires: coreutils Requires: perl-base = %{perl_version} ++++++ perl-Bootloader-0.821.tar.xz -> perl-Bootloader-0.822.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.821/perl-Bootloader.changes new/perl-Bootloader-0.822/perl-Bootloader.changes --- old/perl-Bootloader-0.821/perl-Bootloader.changes 2014-08-20 16:26:07.000000000 +0200 +++ new/perl-Bootloader-0.822/perl-Bootloader.changes 2014-09-16 10:50:53.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 16 10:36:10 CEST 2014 - [email protected] + +- join byid and kern maps instead of picking one (bnc #896665) +- 0.822 + +------------------------------------------------------------------- Tue Aug 19 15:04:27 CEST 2014 - [email protected] - support GRUB_ENABLE_CRYPTODISK config option (bnc #887888) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.821/src/Core/GRUB2.pm new/perl-Bootloader-0.822/src/Core/GRUB2.pm --- old/perl-Bootloader-0.821/src/Core/GRUB2.pm 2014-08-20 16:26:07.000000000 +0200 +++ new/perl-Bootloader-0.822/src/Core/GRUB2.pm 2014-09-16 10:50:53.000000000 +0200 @@ -169,18 +169,18 @@ } # we prefer by-id device than kernel device - if (%map_byid) { - $self->{device_map} = \%map_byid; - } elsif (%map_kern) { - $self->{device_map} = \%map_kern; + if (%map_kern || %map_byid) { + # ensure that hash values (hd0, hd1...) are unique + my %x; + $x{$map_kern{$_}} = $_ for reverse sort keys %map_kern; + $x{$map_byid{$_}} = $_ for reverse sort keys %map_byid; + $self->{device_map}{$x{$_}} = $_ for sort keys %x; } else { $self->{device_map} = {}; $self->warning ("empty device.map\n"); } - while ((my $unix, my $fw) = each (%{$self->{device_map}})) { - $self->milestone ("grub2 device map: $unix <=> $fw\n"); - } + $self->milestone("grub2 device map =", $self->{device_map}); } sub GetKernelDevice { @@ -238,11 +238,9 @@ $dev = $1; } + $self->milestone("device_map =", $self->{device_map}); + my $match_found = 0; - $self->milestone("device_map: ".$self->{"device_map"}); - while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) { - $self->milestone("device_map: $unix <-> $fw."); - } while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) { if ($dev eq $fw) { $dev = $unix; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.821/version new/perl-Bootloader-0.822/version --- old/perl-Bootloader-0.821/version 2014-08-20 16:26:07.000000000 +0200 +++ new/perl-Bootloader-0.822/version 2014-09-16 10:50:53.000000000 +0200 @@ -1 +1 @@ -0.821 +0.822 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
