commit perl-Bootloader for openSUSE:Factory

27 Nov 2009

Hello community,

here is the log from the commit of package perl-Bootloader for openSUSE:Factory
checked in at Fri Nov 27 14:56:37 CET 2009.



--------

--- perl-Bootloader/perl-Bootloader.changes	2009-10-09 13:43:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes	2009-11-25 14:59:57.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Nov 25 13:50:16 UTC 2009 - jreidinger@novell.com
+
+- don't translate during kernel-update mdraid over whole disc
+  (FATE#305883)
+- fix problems with MD Raid (bnc#533866,bnc#547580)
+- pass vga mode to xen kernel (FATE#305310); fix mdraid test to
+  check proper directory
+- 0.5.7
+
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  perl-Bootloader-0.5.6.tar.bz2

New:
----
  perl-Bootloader-0.5.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.xFLGDv/_old	2009-11-27 14:54:54.000000000 +0100
+++ /var/tmp/diff_new_pack.xFLGDv/_new	2009-11-27 14:54:54.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package perl-Bootloader (Version 0.5.6)
+# spec file for package perl-Bootloader (Version 0.5.7)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           perl-Bootloader
-Version:        0.5.6
+Version:        0.5.7
 Release:        1
 Requires:       perl-base = %{perl_version}
 Requires:       e2fsprogs

++++++ perl-Bootloader-0.5.6.tar.bz2 -> perl-Bootloader-0.5.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Core/ELILO.pm
--- old/perl-Bootloader-0.5.6/lib/Bootloader/Core/ELILO.pm	2009-06-02 13:00:30.000000000 +0200
+++ new/perl-Bootloader-0.5.7/lib/Bootloader/Core/ELILO.pm	2009-10-27 19:53:27.000000000 +0100
@@ -463,6 +463,7 @@
         elsif ($key eq "append") 
         {
           my $first = $sectinfo{"xen_append"} || "";
+          $first = "vga=mode-".(delete $sectinfo{"vgamode"})." $first" if ($sectinfo{"vgamode"} ne "");
           my $second = $sectinfo{"append"} || "";  
           my $console = $sectinfo{"console"} || "";
           $console = "console=$console" if ($console ne "");
@@ -505,7 +506,7 @@
 	    $line_ref->{"key"} = "label";
 	    push @lines, $line_ref;
 	}
-        elsif ( $key eq "append" || $key eq "console" || $key eq "xen_append" )
+        elsif ( $key eq "append" || $key eq "console" || $key eq "xen_append"  || $key eq "vgamode")
         {
           if (defined($create_append))
           {
@@ -516,10 +517,10 @@
             if ($type eq "xen")
             {
               my $xen_append = $sectinfo{"xen_append"} || "";
-              $val = "$xen_append -- $val";
+              my $vga = "";
+              $vga="vga=mode-".$sectinfo{"vgamode"}." " if ($sectinfo{"vgamode"} ne "");
+              $val = "$vga$xen_append -- $val";
             }
-
-            
             push @lines, {
 	        "key" => "append",
 	        "value" => $val,
@@ -613,7 +614,12 @@
            {
              $val =~ m/(.*)--(.*)/;
              my $xen_app = $1;
-             my $host_app = $2;
+             my $host_app = $2;             
+             if ($xen_app =~ m/(.*)vga=mode-(\S+)\s*(.*)/)
+             {
+               $ret{"vgamode"} = $2;
+               $xen_app = $self->MergeIfDefined($1,$3)
+             }
              $ret{"xen_append"} = $self->trim($xen_app);
              $ret{"append"} = $self->trim($host_app);
            }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Core/GRUB.pm
--- old/perl-Bootloader-0.5.6/lib/Bootloader/Core/GRUB.pm	2009-08-04 14:16:20.000000000 +0200
+++ new/perl-Bootloader-0.5.7/lib/Bootloader/Core/GRUB.pm	2009-10-27 19:53:27.000000000 +0100
@@ -1069,13 +1069,13 @@
 		    if (exists $ret{"xen_append"}) {
 		        my $xen_append = $ret{"xen_append"};
 		        while ($xen_append =~
-			    s/(.*)console=(\S+)\s*(.*)$/$1$3/o) {
-		              my $del_console = $2;
-				$xen_append =~
-			        s/(.*)${del_console}=\w+\s*(.*)$/$1$2/g;
-			}
-                        $xen_append =~ s/\s*(\S*)\s*$/$1/;
-			$ret{"xen_append"} = "console=$console $speed $xen_append";
+			            s/(.*)console=(\S+)\s*(.*)$/$1$3/o) {
+		           my $del_console = $2;
+      				$xen_append =~
+			          s/(.*)${del_console}=\w+\s*(.*)$/$1$2/g;
+			      }
+            $xen_append =~ s/\s*(\S*)\s*$/$1/;
+      			$ret{"xen_append"} = "console=$console $speed $xen_append";
 		    } else {
 		        $ret{"xen_append"} = "console=$console $speed";
 		    }
@@ -1085,6 +1085,11 @@
 	}
 	elsif ($key eq "xen")
 	{
+	    if ($val =~ /^(?:(.*)\s+)?vga=mode-(\S+)(?:\s+(.*))?$/)
+	    {
+		    $ret{"vgamode"} = $2 if $2 ne "";
+    		$val = $self->MergeIfDefined ($1, $3);
+	    }
 	    # split into loader and parameter, note that the regex does
 	    # always match
 	    $val =~ /^\s*(\S+)(?:\s+(.*))?$/;
@@ -1447,9 +1452,11 @@
         }
 	elsif ($key eq "kernel") {
 	    if ($type eq "xen") {
-		$line_ref->{"value"} =
-		    $self->UnixPath2GrubPath (delete($sectinfo{"xen"}), $grub_root)
-		    . " " . (delete($sectinfo{"xen_append"}) || "");
+        my $xen = $self->UnixPath2GrubPath (delete($sectinfo{"xen"}), $grub_root);
+        my $append = (delete($sectinfo{"xen_append"}) || "");
+        my $vga = delete ($sectinfo{"vgamode"}) || "";
+        $vga = "vga=mode-$vga " if $vga ne "";
+        $line_ref->{"value"} = "$xen $vga$append";
 	    }
 	    elsif ($type eq "image") {
 		$line_ref->{"value"} = $self->CreateKernelLine (\%sectinfo, $grub_root);
@@ -1530,8 +1537,11 @@
 
     # keep a hard order for the following three entries
     if (exists $sectinfo{"xen"} && $type eq "xen") {
-      my $value = $self->UnixPath2GrubPath ($sectinfo{"xen"}, $grub_root)
-                      . " " . ($sectinfo{"xen_append"} || "");
+      my $xen = $self->UnixPath2GrubPath (delete($sectinfo{"xen"}), $grub_root);
+      my $append = (delete($sectinfo{"xen_append"}) || "");
+      my $vga = $sectinfo{"vgamode"} || "";
+      $vga = "vgamode=$vga " if $vga ne "";
+      my $value = "$xen $vga$append";
       push @lines, {
 	"key" => "kernel",
         "value" => $value,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Core.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Core.pm
--- old/perl-Bootloader-0.5.6/lib/Bootloader/Core.pm	2009-08-11 11:00:15.000000000 +0200
+++ new/perl-Bootloader-0.5.7/lib/Bootloader/Core.pm	2009-10-27 19:53:27.000000000 +0100
@@ -1779,6 +1779,7 @@
 
     my $output = `cat $log`;
     $self->l_milestone("run $command - ret $ret + output: $output");
+    $self->l_error("Command '$command' failed with code $ret and output: $output") unless $ret == 0;
 
     return $ret;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Library.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Library.pm
--- old/perl-Bootloader-0.5.6/lib/Bootloader/Library.pm	2009-08-04 16:27:25.000000000 +0200
+++ new/perl-Bootloader-0.5.7/lib/Bootloader/Library.pm	2009-11-19 17:44:42.000000000 +0100
@@ -361,7 +361,7 @@
 
     while ((my $phys, my $mp) = each (%{$map_ref}))
     {
-	Bootloader::Logger::instance()->milestone ("Library::DefineUdevMapping: Udev device: ".$phys||""." ;  kernel: ".$mp||""."");
+	Bootloader::Logger::instance()->milestone ("Library::DefineUdevMapping: Udev device: ".($phys||"")." ;  kernel: ".($mp||"")."");
     }
 
   $loader->{"udevmap"} = $map_ref;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.6/lib/Bootloader/Tools.pm new/perl-Bootloader-0.5.7/lib/Bootloader/Tools.pm
--- old/perl-Bootloader-0.5.6/lib/Bootloader/Tools.pm	2009-10-09 13:38:39.000000000 +0200
+++ new/perl-Bootloader-0.5.7/lib/Bootloader/Tools.pm	2009-11-25 14:56:34.000000000 +0100
@@ -427,7 +427,7 @@
   }
 
   while (my ($k,$v) = each (%mapping)){
-      $logger->milestone ("UDEV MAPPING: ".$k||""." -> ".$v||""." \n");
+      $logger->milestone ("UDEV MAPPING: ".($k||"")." -> ".($v||""));
   }
 
 
@@ -643,6 +643,7 @@
 
 # FIXME: this has to be read through yast::storage
 sub ReadRAID1Arrays {
+    my $udevmapping = shift;
     my $logger = Bootloader::Logger::instance();
     my %mapping = ();
     # use '/sbin/mdadm --detail --verbose --scan'
@@ -679,14 +680,19 @@
         if ($line =~ /ARRAY (\S+) level=(\w+) num-devices=(\d+)/)
         {
             ($array, $level, $num_devices) = ($1, $2, $3);
-             $logger->milestone("Tools::ReadRAID1Arrays: set array $array level $level and device count to $num_devices");
+            #udevadm sometime return udev symlink instead of physical device, bnc#547580
+            $array = $udevmapping->{$array} if $udevmapping->{$array};
+            $logger->milestone("Tools::ReadRAID1Arrays: set array $array level $level and device count to $num_devices");
         }
         elsif ($level eq "raid1" and $line =~ /devices=(\S+)/)
         {
             # we could test $num_device against number of found devices to
             # detect degradedmode but that does not matter here (really?) 
              $logger->milestone("Tools::ReadRAID1Arrays: set to array $array values $1");
-             $mapping{$array} = [ split(/,/, $1) ];
+      	     my @devices = split(/,/,$1);
+	           if ($devices[0]=~ m/^.*\d+$/){ #add only non-disc arrays
+      	       $mapping{$array} = [ @devices ];
+      	     }
         }
     }
     $logger->milestone("Tools::ReadRAID1Arrays: finish parsing mdadm --detail --verbose --scan:");
@@ -744,7 +750,7 @@
     my $um = GetUdevMapping();
     my $mp = ReadMountPoints ($um);
     my $part = ReadPartitions ($um);
-    my $md = ReadRAID1Arrays ();
+    my $md = ReadRAID1Arrays ($um);
     my $mpath = GetMultipath ();
 
     $lib_ref->SetLoaderType (GetBootloader ());
@@ -859,7 +865,9 @@
 
 
 sub UpdateBootloader {
-    $lib_ref->UpdateBootloader ();
+    my $ret = $lib_ref->UpdateBootloader ();
+    DumpLog ($lib_ref->{"loader"});
+    return $ret;
 }
 
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)