commit perl-Bootloader

29 Nov 2006

Hello community,

here is the log from the commit of package perl-Bootloader
checked in at Wed Nov 29 14:21:18 CET 2006.

--------

--- perl-Bootloader/perl-Bootloader.changes	2006-11-27 17:46:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/STABLE/perl-Bootloader/perl-Bootloader.changes	2006-11-29 13:39:53.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 29 13:34:40 CET 2006 - jplack@suse.de
+
+- handle xen sections correctly in update-bootloader (#224330)
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.rtQ49d/_old	2006-11-29 14:20:51.000000000 +0100
+++ /var/tmp/diff_new_pack.rtQ49d/_new	2006-11-29 14:20:51.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package perl-Bootloader (Version 0.4.4)
+# spec file for package perl-Bootloader (Version 0.4.5)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           perl-Bootloader
-Version:        0.4.4
+Version:        0.4.5
 Release:        1
 Requires:       perl >= %{perl_version}
 Requires:       perl-gettext
@@ -25,7 +25,7 @@
 Source1:        update-bootloader
 Source2:        bootloader_entry
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  -e2fsprogs -limal-bootloader -mdadm
+#!BuildIgnore: mdadm e2fsprogs limal-bootloader
 
 %description
 Perl modules for configuring various boot loaders.
@@ -64,6 +64,8 @@
 /usr/lib/bootloader
 
 %changelog -n perl-Bootloader
+* Wed Nov 29 2006 - jplack@suse.de
+- handle xen sections correctly in update-bootloader (#224330)
 * Mon Nov 27 2006 - od@suse.de
 - do not specify the name of a bootloader entry when removing it
   with bootloader_entry, thus removing all sections matching the


++++++ perl-Bootloader-0.4.4.tar.bz2 -> perl-Bootloader-0.4.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.4/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.5/lib/Bootloader/Core/GRUB.pm
--- old/perl-Bootloader-0.4.4/lib/Bootloader/Core/GRUB.pm	2006-11-21 18:13:46.000000000 +0100
+++ new/perl-Bootloader-0.4.5/lib/Bootloader/Core/GRUB.pm	2006-11-27 19:58:44.000000000 +0100
@@ -163,14 +163,14 @@
     #
 
     # boot from any primary partition with PReP or FAT partition id
-    @bootpart = map {
-	my ($device, $disk, $nr, $fsid, $fstype,
-	    $part_type, $start_cyl, $size_cyl) = @$_;
-	($fstype ne "xfs" and bootable($fsid))
-	         ? $device : ();
-	} @partinfo;
-
-    my $boot_partitions = join(":", @bootpart);
+    my $boot_partitions = join(":", 
+	map {
+	    my ($device, $disk, $nr, $fsid, $fstype,
+		$part_type, $start_cyl, $size_cyl) = @$_;
+	    ($fstype ne "xfs" and bootable($fsid))
+		? $device : ();
+	} @partinfo
+    );
 
     # give a list of possible root devices: all MD devices
     # and all 'Linux' devices above 20 cylinders
@@ -186,6 +186,15 @@
 	# FIXME this does no longer include raid0 and raid5 devices
     );
 
+    # give a list of all other partitions possibly ready for chain loading
+    my $other_partitions = join(":",
+	map {
+	    my ($device, $disk, $nr, $fsid, $fstype,
+		$part_type, $start_cyl, $size_cyl) = @$_;
+	    ($size_cyl >= 20) ? $device : ();
+	} @partinfo
+    );
+
     # FIXME: does it make sense to distinguish between x86_64 and x86?
     $exports{"arch"} = "x86";
     $exports{"global_options"} = {
@@ -234,14 +243,7 @@
 
 	type_other        => "bool:Chainloader section",
 	other_lock        => "bool:Use password protection:false",
-	other_chainloader => "selectdevice:Other system::" .
-	    join(":",
-		 map {
-		     my ($device, $disk, $nr, $fsid, $fstype,
-			 $part_type, $start_cyl, $size_cyl) = @$_;
-		     ($size_cyl >= 20) ? $device : ();
-		 } @partinfo
-	    ),
+	other_chainloader => "selectdevice:Other system::" . $other_partitions,
 	other_noverifyroot=> "bool:Do not verify filesystem before booting:false",
 	other_makeactive  => "bool:Activate this partition when selected for boot:false",
 	other_blockoffset => "int:Block offset for chainloading:1:0:32",

++++++ update-bootloader ++++++
--- perl-Bootloader/update-bootloader	2006-09-19 17:32:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/STABLE/perl-Bootloader/update-bootloader	2006-11-29 13:39:53.000000000 +0100
@@ -242,7 +242,7 @@
 	unless $opt_name and $opt_image;
 
     my @params = (
-		  type  => $type eq "xen" ? "image" : $type,
+		  type  => $type,
 		  image => $opt_image,
     );
     if (CountSections(@params) != 0)
@@ -261,7 +261,7 @@
 
 if (defined $oper{remove}) {
     my @params = (
-		  type  => $type eq "xen" ? "image" : $type,
+		  type  => $type,
 		  image => $opt_image,
     );
     push @params, xen    => $opt_xen_kernel if $type eq "xen";


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



Remember to have fun...

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

    

root＠suse.de

tags

participants (1)