commit yast2-bootloader

19 May 2006

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Fri May 19 16:56:28 CEST 2006.

--------

--- yast2-bootloader/yast2-bootloader.changes	2006-05-17 22:43:59.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes	2006-05-19 16:07:48.000000000 +0200
@@ -1,0 +2,14 @@
+Fri May 19 16:05:32 CEST 2006 - od@suse.de
+
+- added FIXME note to Bootloader.ycp
+- send partitioning info always when Initializer called (#161755)
+- 2.13.65
+
+-------------------------------------------------------------------
+Fri May 19 12:25:09 CEST 2006 - od@suse.de
+
+- fixed installation of installation kernel (ISERIES64) into slot A
+  on iSeries (#165497)
+- 2.13.64
+
+-------------------------------------------------------------------

Old:
----
  yast2-bootloader-2.13.63.tar.bz2

New:
----
  yast2-bootloader-2.13.65.tar.bz2

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

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.wiLDIn/_old	2006-05-19 16:56:20.000000000 +0200
+++ /var/tmp/diff_new_pack.wiLDIn/_new	2006-05-19 16:56:20.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-bootloader (Version 2.13.63)
+# spec file for package yast2-bootloader (Version 2.13.65)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-bootloader
-Version:        2.13.63
+Version:        2.13.65
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-bootloader-2.13.63.tar.bz2
+Source0:        yast2-bootloader-2.13.65.tar.bz2
 prefix:		/usr
 BuildRequires:  docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
 PreReq:         /bin/sed %fillup_prereq
@@ -60,7 +60,7 @@
     Dan Meszaros
 
 %prep
-%setup -n yast2-bootloader-2.13.63
+%setup -n yast2-bootloader-2.13.65
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,14 @@
 /usr/share/YaST2/clients/bootfloppy.ycp
 
 %changelog -n yast2-bootloader
+* Fri May 19 2006 - od@suse.de
+- added FIXME note to Bootloader.ycp
+- send partitioning info always when Initializer called (#161755)
+- 2.13.65
+* Fri May 19 2006 - od@suse.de
+- fixed installation of installation kernel (ISERIES64) into slot A
+  on iSeries (#165497)
+- 2.13.64
 * Wed May 17 2006 - od@suse.de
 - fix backwards mapping of "mount by" device names when bl
   configuration is read (#176201)

++++++ yast2-bootloader-2.13.63.tar.bz2 -> yast2-bootloader-2.13.65.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.63/VERSION new/yast2-bootloader-2.13.65/VERSION
--- old/yast2-bootloader-2.13.63/VERSION	2006-05-17 22:42:43.000000000 +0200
+++ new/yast2-bootloader-2.13.65/VERSION	2006-05-19 16:05:16.000000000 +0200
@@ -1 +1 @@
-2.13.63
+2.13.65
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.63/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.65/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.13.63/src/modules/BootPOWERLILO.ycp	2006-05-17 16:52:00.000000000 +0200
+++ new/yast2-bootloader-2.13.65/src/modules/BootPOWERLILO.ycp	2006-05-19 16:02:01.000000000 +0200
@@ -14,7 +14,7 @@
  *      Joachim Plack <jplack@suse.de>
  *      Olaf Dabrunz <od@suse.de>
  *
- * $Id: BootPOWERLILO.ycp 30978 2006-05-17 14:51:57Z odabrunz $
+ * $Id: BootPOWERLILO.ycp 31068 2006-05-19 13:40:16Z jplack $
  *
  */
 
@@ -53,6 +53,9 @@
 // PReP boot partitions that were proposed by partitioner to install BL
 global list<string> install_prep_boot_partitions = [];
 
+// saved ID of the base installation source
+global integer base_source = -1;
+
 // iSeries specific global settings
 
 // filename for the iSeries kernel, for streamfile *STMF booting
@@ -465,6 +468,41 @@
 
 }
 
+/**
+ * Save the ID of the base installation source
+ * modifies internal variable
+ */
+global void SaveInstSourceId () {
+
+    base_source = -1;
+
+    // Find the source ID of the base product:
+    // list all products
+    list<map<string,any> > products =
+	Pkg::ResolvableProperties ("", `product, "");
+    y2internal ("products: %1", products);
+    // filter products to be installed
+    products = filter (map<string,any> p, products, {
+	return p["source"]:-1 != -1;
+    });
+    // get base products
+    list<map<string,any> > base_products =
+	filter (map<string,any> p, products, {
+	    return p["category"]:"" == "base";
+	});
+    if (size (base_products) == 0)
+	base_products = products; // just to be safe in case of a bug...
+    list<integer> sources = maplist (map<string,any> p, base_products, {
+	return p["source"]:-1;
+    });
+    y2internal ("remaining products: %1, sources: %2",
+	products, sources);
+    sources = sort (sources);
+    base_source = sources[0]:-1;
+
+    y2milestone ("Base source: %1", base_source);
+}
+
 // general functions
 
 /**
@@ -474,6 +512,12 @@
     y2debug ("Started propose: Glob: %1, Sec: %2",
 	BootCommon::globals, BootCommon::sections);
 
+    // Need to remember inst source ID now to get the ISERIES64 file from the
+    // inst source later on (see Bug #165497, Comment #16). This won't work
+    // later during inst_finish, so we need to do it earlier -- only the
+    // proposal is a possible place.
+    SaveInstSourceId();
+
     // FIXME: make modern code out of these conditionals
     //        - comments
     //        - simplify
@@ -1021,7 +1065,10 @@
     // type discription through here
     // FIXME: This is a hack: we need another interface to get the
     // type descriptions
-    BootCommon::InitializeLibrary (false, "ppc");
+    if(!BootCommon::InitializeLibrary (false, "ppc")) {
+        // send current disk/partition information to perl-Bootloader
+	BootCommon::SetDiskInfo ();
+    };
     BootCommon::globals = (map<string,string>)
 	union(BootCommon::globals,
 	    filter(string key, string val, BootCommon::GetGlobal(),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.63/src/modules/Bootloader.ycp new/yast2-bootloader-2.13.65/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.13.63/src/modules/Bootloader.ycp	2006-03-13 16:36:58.000000000 +0100
+++ new/yast2-bootloader-2.13.65/src/modules/Bootloader.ycp	2006-05-19 16:02:01.000000000 +0200
@@ -11,7 +11,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: Bootloader.ycp 28903 2006-03-13 15:32:39Z jplack $
+ * $Id: Bootloader.ycp 31060 2006-05-19 12:21:30Z jplack $
  *
  */
 
@@ -407,6 +407,7 @@
 	// Initialize device mapper and LVM in target system
 	if (Stage::initial () || Mode::update ())
 	{
+	    # FIXME: should be handled by partitioner
 	    map out = (map)SCR::Execute (.target.bash_output,
 		"test -f /sbin/devmap_mknod.sh && /sbin/devmap_mknod.sh;" +
 		"test -f /sbin/vgscan && /sbin/vgscan --mknodes"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.63/src/ppc/iseries.ycp new/yast2-bootloader-2.13.65/src/ppc/iseries.ycp
--- old/yast2-bootloader-2.13.63/src/ppc/iseries.ycp	2006-05-17 16:49:02.000000000 +0200
+++ new/yast2-bootloader-2.13.65/src/ppc/iseries.ycp	2006-05-19 12:24:33.000000000 +0200
@@ -12,7 +12,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: iseries.ycp 30894 2006-05-12 14:02:14Z odabrunz $
+ * $Id: iseries.ycp 31047 2006-05-19 10:24:31Z odabrunz $
  *
  */
 
@@ -263,10 +263,14 @@
 	    string command = "";
 	    string my_log = "/var/log/YaST2/y2log_bootloader_iseries_slot_a";
 
-	    list<integer> sources = Pkg::SourceStartCache (true);
-	    integer source_id = sources[0]:0;
 	    string src_filename
-		= Pkg::SourceProvideFile(source_id, 1, "/ISERIES64");
+		= Pkg::SourceProvideFile(base_source, 1, "/ISERIES64");
+
+	    if (base_source == -1 || src_filename == nil) {
+		y2milestone ("Cannot write rescue kernel to slot A, base source not found");
+		return false;
+	    }
+
 	    string rescue_bootbinary = (string)SCR::Read (.target.tmpdir)
 		+ "/rescue_bootbinary";
 	    string tg_rescue_bootbinary
@@ -287,7 +291,7 @@
 		my_log))
 		return false;
 
-	    // NOTE: on SLES10, the "root=" paramter is not handled by the
+	    // NOTE: on SLES10, the "root=" parameter is not handled by the
 	    // initrd in the ISERIES64 file. The initrd just boots up to a
 	    // shell.
 	    SCR::Execute (.target.bash,


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)