Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at Wed Dec 16 10:45:34 CET 2009. -------- --- perl-Bootloader/perl-Bootloader.changes 2009-11-25 14:59:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2009-12-15 15:24:48.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Dec 15 14:18:51 UTC 2009 - jreidinger@novell.com + +- fix md raid duplication of boot sector (bnc#555574) +- adapt failsafe to disable KMS (bnc#560426) +- fix printing warning (bnc#559151) +- 0.5.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-Bootloader-0.5.7.tar.bz2 New: ---- perl-Bootloader-0.5.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.YN6jhD/_old 2009-12-16 10:44:41.000000000 +0100 +++ /var/tmp/diff_new_pack.YN6jhD/_new 2009-12-16 10:44:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.5.7) +# spec file for package perl-Bootloader (Version 0.5.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.5.7 +Version: 0.5.8 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs ++++++ perl-Bootloader-0.5.7.tar.bz2 -> perl-Bootloader-0.5.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.7/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.5.8/lib/Bootloader/Core/ELILO.pm --- old/perl-Bootloader-0.5.7/lib/Bootloader/Core/ELILO.pm 2009-10-27 19:53:27.000000000 +0100 +++ new/perl-Bootloader-0.5.8/lib/Bootloader/Core/ELILO.pm 2009-12-03 11:59:46.000000000 +0100 @@ -463,7 +463,7 @@ elsif ($key eq "append") { my $first = $sectinfo{"xen_append"} || ""; - $first = "vga=mode-".(delete $sectinfo{"vgamode"})." $first" if ($sectinfo{"vgamode"} ne ""); + $first = "vga=mode-".(delete $sectinfo{"vgamode"})." $first" if (defined $sectinfo{'vgamode'} && $sectinfo{"vgamode"} ne ""); my $second = $sectinfo{"append"} || ""; my $console = $sectinfo{"console"} || ""; $console = "console=$console" if ($console ne ""); @@ -518,7 +518,7 @@ { my $xen_append = $sectinfo{"xen_append"} || ""; my $vga = ""; - $vga="vga=mode-".$sectinfo{"vgamode"}." " if ($sectinfo{"vgamode"} ne ""); + $vga="vga=mode-".$sectinfo{"vgamode"}." " if (defined $sectinfo{"vgamode"} && $sectinfo{"vgamode"} ne ""); $val = "$vga$xen_append -- $val"; } push @lines, { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.7/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.5.8/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.5.7/lib/Bootloader/Core/GRUB.pm 2009-10-27 19:53:27.000000000 +0100 +++ new/perl-Bootloader-0.5.8/lib/Bootloader/Core/GRUB.pm 2009-12-15 14:03:27.000000000 +0100 @@ -811,6 +811,8 @@ my %glob = %{$self->{"global"}}; my @grub_conf = (); my %s1_devices = (); + # md_discs stores grub discs which should be synchronized (needed for correct stage2 location) + my $md_discs = {}; { my $dev; @@ -830,13 +832,16 @@ } # boot_md_mbr synchronize mbr of disc in md raid - #(it is little tricky as md raid synchronize only partitions) + #(it is little tricky as md raid synchronize only partitions) $flag = delete $glob{"boot_md_mbr"}; if (defined $flag and $flag ne "") { my @discs = split(/,/,$flag); chomp @discs; foreach my $mbr_disc (@discs){ - $s1_devices{$mbr_disc} = 1; + $s1_devices{$mbr_disc} = 1; + my $gdev = $self->UnixDev2GrubDev($mbr_disc); + $md_discs->{$gdev} = substr($gdev,1,-1); + $self->l_milestone ("GRUB::CreateGrubConfLines: md_mbr device: $gdev "); } } @@ -960,7 +965,17 @@ { my $options = join " ", @{$grub_conf_item->{"options"} || []}; my $location = $self->UnixDev2GrubDev ($grub_conf_item->{"device"}); - my $line = "setup $options $location " . $stage1dev || $location; + my $stage_location = $stage1dev || $location; + if ($md_discs->{$location}) + { + $self->l_milestone("GrubConfCreate: detected md_discs $location"); + $stage_location =~ m/\(([^,)]+)(,[^)]+)?\)/; + my $old_disc = $1; + my $new_disc = $md_discs->{$location}; + $stage_location =~ s/$old_disc/$new_disc/; + $self->l_milestone("GrubConfCreate: resulting location $stage_location"); + } + my $line = "setup $options $location " . $stage_location; push @grub_conf, $line; delete $s1_devices{$grub_conf_item->{"device"}}; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.7/lib/Bootloader/Tools.pm new/perl-Bootloader-0.5.8/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.5.7/lib/Bootloader/Tools.pm 2009-11-25 14:56:34.000000000 +0100 +++ new/perl-Bootloader-0.5.8/lib/Bootloader/Tools.pm 2009-12-04 14:16:44.000000000 +0100 @@ -1130,10 +1130,10 @@ chomp ($arch); if ($arch eq "i386") { - $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off x11failsafe"; + $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off x11failsafe nomodeset"; } elsif ($arch eq "x86_64") { - $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume edd=off x11failsafe"; + $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume edd=off x11failsafe nomodeset"; } elsif ($arch eq "ia64") { $new{"append"} = "ide=nodma nohalt noresume 3"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org