commit perl-Bootloader for openSUSE:Factory
Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at Fri May 28 17:40:10 CEST 2010. -------- --- perl-Bootloader/perl-Bootloader.changes 2010-04-22 14:53:27.000000000 +0200 +++ perl-Bootloader/perl-Bootloader.changes 2010-05-26 16:24:07.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 25 14:53:23 UTC 2010 - jreidinger@novell.com + +- port changes from SLE11SP1 +- user properly names for raid disc in partition map (bnc#607852) +- add missing keyword to hashed password (bnc#598025) +- 0.5.12 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-Bootloader-0.5.11.tar.bz2 New: ---- perl-Bootloader-0.5.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.bxZqPK/_old 2010-05-28 17:38:58.000000000 +0200 +++ /var/tmp/diff_new_pack.bxZqPK/_new 2010-05-28 17:38:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.5.11) +# spec file for package perl-Bootloader (Version 0.5.12) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.5.11 +Version: 0.5.12 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs ++++++ perl-Bootloader-0.5.11.tar.bz2 -> perl-Bootloader-0.5.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.11/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.5.12/lib/Bootloader/Core/ELILO.pm --- old/perl-Bootloader-0.5.11/lib/Bootloader/Core/ELILO.pm 2009-12-03 11:59:46.000000000 +0100 +++ new/perl-Bootloader-0.5.12/lib/Bootloader/Core/ELILO.pm 2010-05-25 16:53:17.000000000 +0200 @@ -349,6 +349,7 @@ my @lines_new = (); my $go = $self->{"options"}{"global"}; $globinfo{"default"} = $sections[0]->{"name"} unless (defined $globinfo{"default"}); + $globinfo{"default"} = $self->FixSectionName($globinfo{"default"},[]); # allow to keep the section unchanged return \@lines unless $globinfo{"__modified"} || 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.11/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.5.12/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.5.11/lib/Bootloader/Core/GRUB.pm 2010-04-09 12:50:29.000000000 +0200 +++ new/perl-Bootloader-0.5.12/lib/Bootloader/Core/GRUB.pm 2010-05-25 16:53:17.000000000 +0200 @@ -612,10 +612,10 @@ { #multipath handling, multipath need real device, because multipath # device have broken geometry (bnc #448110) - if (defined $self->{"multipath"} && defined $self->{"multipath"}->{$2}){ - $devmap{ $self->{"multipath"}->{$2} } = $1; + if (defined $self->{"multipath"} && defined $self->{"multipath"}->{$self->GetKernelDevice($2)}){ + $devmap{ $self->{"multipath"}->{$self->GetKernelDevice($2)} } = $1; } else { - $devmap{$2} = $1; + $devmap{$2} = $1; } } }; @@ -1996,9 +1996,9 @@ $self->l_debug ("GRUB::GrubDev2MountPoint : MD Array: $md ; Members: $members"); foreach my $md_member (@{$members_ref}) { - if ($device eq $md_member) { + if ($self->GetKernelDevice($device) eq $self->GetKernelDevice($md_member)) { $self->l_milestone ("GRUB::GrubDev2MountPoint : find md: $md"); - push (@devices, $md); + push (@devices, $md); } } } @@ -2009,9 +2009,9 @@ foreach $device (@devices) { while ((my $mp, my $d) = each (%{$self->{"mountpoints"}})) { $self->l_debug ("GRUB::GrubDev2MountPoint : record $mp <-> $d"); - if ($self->GetKernelDevice($d) eq $device) { - $self->l_milestone ("GRUB::GrubDev2MountPoint : find mountpoint: $mp"); - $mountpoint = $mp; + if ($self->GetKernelDevice($d) eq $self->GetKernelDevice($device)) { + $self->l_milestone ("GRUB::GrubDev2MountPoint : find mountpoint: $mp"); + $mountpoint = $mp; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.11/lib/Bootloader/Core/PowerLILO.pm new/perl-Bootloader-0.5.12/lib/Bootloader/Core/PowerLILO.pm --- old/perl-Bootloader-0.5.11/lib/Bootloader/Core/PowerLILO.pm 2009-06-02 13:00:30.000000000 +0200 +++ new/perl-Bootloader-0.5.12/lib/Bootloader/Core/PowerLILO.pm 2010-05-25 16:53:17.000000000 +0200 @@ -215,6 +215,11 @@ # beside space equal sign and quote signs should be ok, no length limit $name =~ s/[^\w.-]/_/g; + if (length($name) > 15) + { + $name = substr $name,0,13; #cut more to have space to unique fix + } + # and make the section name unique $name = $self->SUPER::FixSectionName($name, $names_ref, $orig_name); @@ -389,6 +394,8 @@ my @lines_new = (); my $go = $self->{"options"}{"global"}; my $arch = $self->{"arch"}; + + $globinfo{"default"} = $self->FixSectionName($globinfo{"default"},[]); # allow to keep the section unchanged return \@lines unless $globinfo{"__modified"} || 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.11/lib/Bootloader/Core/ZIPL.pm new/perl-Bootloader-0.5.12/lib/Bootloader/Core/ZIPL.pm --- old/perl-Bootloader-0.5.11/lib/Bootloader/Core/ZIPL.pm 2009-10-09 13:38:39.000000000 +0200 +++ new/perl-Bootloader-0.5.12/lib/Bootloader/Core/ZIPL.pm 2010-05-25 16:53:17.000000000 +0200 @@ -786,26 +786,42 @@ # the @sect_names array my @menu_list_array = split (/\s*,\s*/, $menu_list); my @sect_names_to_append = (); + my @failsafe_sect_names_to_append = (); # Search for sections in @sect_names array which are not yet in "list" of # menu section and which are not a menu section theirselves. If found, # append them to the "list" of the menu section. - foreach my $sect_name (@sect_names) { + foreach my $sect (@sectinfo) { my $found = 0; foreach my $entry (@menu_list_array) { - if ($entry eq $sect_name) { + if ($entry eq $sect->{"name"}) { $found = 1; } } - - if (!$found and $sect_name ne "menu") { - push @sect_names_to_append, $sect_name; + my $is_dump = (($sect->{"type"} eq "dump") and + (defined $sect->{"dumpto"}) and ($sect->{"dumpto"} ne "")); + if (!$found and $sect->{"name"} ne "menu" and !$is_dump) { + if ($sect->{"original_name"} =~ /failsafe/i || $sect->{"name"} =~ /failsafe/i) + { + push @failsafe_sect_names_to_append, $sect->{"name"}; + } + else + { + push @sect_names_to_append, $sect->{"name"}; + } } } if (scalar @sect_names_to_append > 0) { + unshift @menu_list_array, @failsafe_sect_names_to_append if (scalar @failsafe_sect_names_to_append > 0); unshift @menu_list_array, @sect_names_to_append; $menu_list = join (', ', @menu_list_array); + } elsif (scalar @failsafe_sect_names_to_append > 0){ + #do not add failsafe as first option bnc#600847 + my $name = shift @menu_list_array; + unshift @menu_list_array, @failsafe_sect_names_to_append; + unshift @menu_list_array, $name; + $menu_list = join (', ', @menu_list_array); } # Write back the new "list" to menu section diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.11/lib/Bootloader/Library.pm new/perl-Bootloader-0.5.12/lib/Bootloader/Library.pm --- old/perl-Bootloader-0.5.11/lib/Bootloader/Library.pm 2009-11-19 17:44:42.000000000 +0100 +++ new/perl-Bootloader-0.5.12/lib/Bootloader/Library.pm 2010-05-25 16:58:02.000000000 +0200 @@ -1032,12 +1032,13 @@ sub CountGRUBPassword{ my $self = shift; my $pass = shift; + return $pass if $pass =~ m/--md5/; #check if password is already hashed my $res = qx{echo "md5crypt \ $pass" | grub --batch | grep Encrypted }; $res =~ s/Encrypted:\s+(.*)$/$1/; Bootloader::Logger::instance()->milestone("Library::CountGRUBPassword result $res" ); return undef unless $res =~ m/^\$1\$.*\$.*$/; - return $res; + return "--md5 $res"; } sub UpdateSerialConsole{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.11/lib/Bootloader/Path.pm new/perl-Bootloader-0.5.12/lib/Bootloader/Path.pm --- old/perl-Bootloader-0.5.11/lib/Bootloader/Path.pm 2008-11-04 19:32:28.000000000 +0100 +++ new/perl-Bootloader-0.5.12/lib/Bootloader/Path.pm 2010-05-14 14:10:26.000000000 +0200 @@ -25,8 +25,6 @@ C<< $path = Bootloader::Path::Fstab(); >> -C<< $path = Bootloader::Path::Blkid(); >> - C<< $path = Bootloader::Path::Sysconfig(); >> C<< $path = Bootloader::Path::Grub_menulst(); >> @@ -99,18 +97,6 @@ return Prefix($value); } -=item -C<< $path = Bootloader::Path::Blkid(); >> - -Gets path for utility blkid. - -=cut - -sub Blkid { - my $value = "/sbin/blkid"; - return Prefix($value); -} - =item C<< $path = Bootloader::Path::Sysconfig(); >> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.11/lib/Bootloader/Tools.pm new/perl-Bootloader-0.5.12/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.5.11/lib/Bootloader/Tools.pm 2010-04-22 14:20:39.000000000 +0200 +++ new/perl-Bootloader-0.5.12/lib/Bootloader/Tools.pm 2010-05-25 16:53:17.000000000 +0200 @@ -273,13 +273,15 @@ $logger->milestone("ReadPartitions: Finded parts: ". join (",",@parts)); # generate proper device names and other info for all @part[ition]s + #raid have ! in names for /dev/raid/name (bnc#607852) + $dev_disk =~ s:!:/:; foreach my $part (@parts) { chomp ($part); $part = "/dev/$part"; - #raid have ! in names for /dev/raid/name - $part =~ s:!:/:; - $part = $udevmap->{$part} if (defined $udevmap->{$part}); + #raid have ! in names for /dev/raid/name + $part =~ s:!:/:; + $part = $udevmap->{$part} if (defined $udevmap->{$part}); my $index = substr ($part, length ($dev_disk)); while (length ($index) > 0 && substr ($index, 0, 1) !~ /[0-9]/) @@ -658,7 +660,7 @@ $mdadm = AddPathToExecutable("mdadm"); if (-e $mdadm) { - open (MD, "$mdadm --detail --verbose --scan |"); + open (MD, "$mdadm --detail --verbose --scan |"); } else { $logger->milestone ("The command \"mdadm\" is not available."); @@ -1137,6 +1139,9 @@ elsif ($arch eq "ia64") { $new{"append"} = "ide=nodma nohalt noresume 3"; } + elsif ($arch eq "s390x") { + $new{"append"} = ""; + } else { print ("Architecture $arch does not support failsafe entries.\n"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de