Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at Wed Apr 14 15:39:08 CEST 2010. -------- --- perl-Bootloader/perl-Bootloader.changes 2010-02-26 15:05:00.000000000 +0100 +++ perl-Bootloader/perl-Bootloader.changes 2010-04-09 11:13:13.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Apr 9 09:08:34 UTC 2010 - jreidinger@novell.com + +- use same root as it is in etc/fstab (bnc#575362) +- use new zypper method to get boot label (prevent hang during + installation) +- 0.5.10 + +------------------------------------------------------------------- +Wed Mar 31 08:21:21 UTC 2010 - jreidinger@novell.com + +- don't allow empty custom boot for GRUB (bnc#589433) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-Bootloader-0.5.9.tar.bz2 New: ---- perl-Bootloader-0.5.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.2iBRIM/_old 2010-04-14 15:38:08.000000000 +0200 +++ /var/tmp/diff_new_pack.2iBRIM/_new 2010-04-14 15:38:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.5.9) +# spec file for package perl-Bootloader (Version 0.5.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.5.9 +Version: 0.5.10 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs ++++++ perl-Bootloader-0.5.9.tar.bz2 -> perl-Bootloader-0.5.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.9/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.5.10/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.5.9/lib/Bootloader/Core/GRUB.pm 2010-01-04 16:37:28.000000000 +0100 +++ new/perl-Bootloader-0.5.10/lib/Bootloader/Core/GRUB.pm 2010-03-31 11:22:34.000000000 +0200 @@ -820,7 +820,7 @@ # boot_custom => "selectdevice:Custom Boot Partition::" $dev = delete($glob{"boot_custom"}); - $s1_devices{$dev} = 1 if defined $dev; + $s1_devices{$dev} = 1 if (defined $dev and $dev ne ""); # boot_mbr => "bool:Boot from Master Boot Record:false", $flag = delete $glob{"boot_mbr"}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.9/lib/Bootloader/Core.pm new/perl-Bootloader-0.5.10/lib/Bootloader/Core.pm --- old/perl-Bootloader-0.5.9/lib/Bootloader/Core.pm 2009-10-27 19:53:27.000000000 +0100 +++ new/perl-Bootloader-0.5.10/lib/Bootloader/Core.pm 2010-02-26 16:20:04.000000000 +0100 @@ -18,10 +18,6 @@ C<< $res = Bootloader::Core->trim ($string); >> -C<< $mountpoint = Bootloader::Core->Dev2MP ($device); >> - -C<< $device = Bootloader::Core->MP2Dev ($mountpoint); >> - C<< $members_ref = Bootloader::Core->MD2Members ($md_device); >> C<< $md_dev = Bootloader::Core->Member2MD (string $md_member); >> @@ -202,45 +198,6 @@ =item -C<< $mountpoint = Bootloader::Core->Dev2MP ($device); >> - -Gets the mount point where a specified device is mounted. As argument -takes the device to examinate (string, eg. C<'/dev/hda1'>), returns the -mountopint where the device is mounter (string, eg. C<'/boot'>), or undef -if the device is not mounted (according to /etc/fstab). - -=cut - -# string Dev2MP (string device) -sub Dev2MP { - my $self = shift; - my $dev = shift; - - foreach my $mp ( keys %{$self->{"mountpoints"}}) { - return $mp if $self->{"mountpoints"}->{$mp} eq $dev; - } - return undef; -} - -=item -C<< $device = Bootloader::Core->MP2Dev ($mountpoint); >> - -Gets the device where filesystem mounted at a specified mountpoint is -located. As argument takes the mount point (string, eg. C<'/boot'>), returns -the device (string, eg. C<'/dev/hda1'>), or undef if there is no device mounted -in the specified directory - -=cut - -# string MP2Dev (string mountpoint) -sub MP2Dev { - my $self = shift; - my $mp = shift; - - return $self->{"mountpoints"}{$mp} || undef; -} - -=item C<< $members_ref = Bootloader::Core->MD2Members ($md_device); >> Gets the list of partitions building an MD software RAID array. As argument diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.9/lib/Bootloader/Tools.pm new/perl-Bootloader-0.5.10/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.5.9/lib/Bootloader/Tools.pm 2010-02-25 13:26:07.000000000 +0100 +++ new/perl-Bootloader-0.5.10/lib/Bootloader/Tools.pm 2010-02-26 16:20:04.000000000 +0100 @@ -203,9 +203,9 @@ { if ($dev =~ m/^LABEL=(.*)/) { - $dev = $udevmap->{"/dev/disk/by-label/$1"}; + $dev = "/dev/disk/by-label/$1"; #do not translate otherwise it changes root always bnc#575362 } elsif ($dev =~ m/UUID=(.*)/){ - $dev = $udevmap->{"/dev/disk/by-uuid/$1"}; + $dev = "/dev/disk/by-uuid/$1"; } $mp =~ s/\\040/ /; #handle spaces in fstab $mountpoints{$mp} = $dev; ++++++ update-bootloader ++++++ --- /var/tmp/diff_new_pack.2iBRIM/_old 2010-04-14 15:38:09.000000000 +0200 +++ /var/tmp/diff_new_pack.2iBRIM/_new 2010-04-14 15:38:09.000000000 +0200 @@ -120,9 +120,9 @@ # first try: use zypper if ( -f '/usr/bin/zypper' ){ - my $zypper_xml = qx{ZYPP_READONLY_HACK=1 zypper -qx --no-refresh pd -i | grep 'isbase="1"'}; - if ($zypper_xml =~ m/^.*summary="([^"]*)".*shortname="([^"]*)".*$/){ - return $1 if ($1 ne ""); #FIXME add here exceptions if bootloader has problems with long names + my $zypper_out = qx{zypper --terse tos -l}; + if ($zypper_out =~ m/^labelLong\s*(\S.*\S)\s*\nlabelShort\s*(\S.*\S)[\s\n]*$/){ + return $1 if ($1 ne "" && $loader eq "grub"); return $2 if ($2 ne ""); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org