commit yast2-bootloader

3 Apr 2006

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Tue Apr 4 00:59:25 CEST 2006.

--------

--- yast2-bootloader/yast2-bootloader.changes	2006-04-01 23:27:58.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes	2006-04-03 20:55:01.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Apr  3 20:51:38 CEST 2006 - od@suse.de
+
+- do not add kernel option "selinux=0" on any architecture (#155856)
+- fixed compilation errors in lib_iface.ycp
+- 2.13.36
+
+-------------------------------------------------------------------
+Mon Apr  3 20:27:48 CEST 2006 - jplack@suse.de
+
+- ppc: update default name if denoted section has been updated
+- ppc: update global clone entry, too, if device names changed
+- fix for #161755, send partition/disk info where neccessary
+- reorder code so that new function SetDiskInfo is formed and can
+  be used in various places to fix #161755 
+- add proposed code change for virtual 'boot' mountpoints (#162242)
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.DmZbbt/_old	2006-04-04 00:58:44.000000000 +0200
+++ /var/tmp/diff_new_pack.DmZbbt/_new	2006-04-04 00:58:44.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-bootloader (Version 2.13.35)
+# spec file for package yast2-bootloader (Version 2.13.36)
 #
 # 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.35
+Version:        2.13.36
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-bootloader-2.13.35.tar.bz2
+Source0:        yast2-bootloader-2.13.36.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.35
+%setup -n yast2-bootloader-2.13.36
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,17 @@
 /usr/share/YaST2/clients/bootfloppy.ycp
 
 %changelog -n yast2-bootloader
+* Mon Apr 03 2006 - od@suse.de
+- do not add kernel option "selinux=0" on any architecture (#155856)
+- fixed compilation errors in lib_iface.ycp
+- 2.13.36
+* Mon Apr 03 2006 - jplack@suse.de
+- ppc: update default name if denoted section has been updated
+- ppc: update global clone entry, too, if device names changed
+- fix for #161755, send partition/disk info where neccessary
+- reorder code so that new function SetDiskInfo is formed and can
+  be used in various places to fix #161755
+- add proposed code change for virtual 'boot' mountpoints (#162242)
 * Sat Apr 01 2006 - od@suse.de
 - added TESTME comment: test parted partition activation with BSD
   slices

++++++ yast2-bootloader-2.13.35.tar.bz2 -> yast2-bootloader-2.13.36.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/VERSION new/yast2-bootloader-2.13.36/VERSION
--- old/yast2-bootloader-2.13.35/VERSION	2006-04-01 23:25:39.000000000 +0200
+++ new/yast2-bootloader-2.13.36/VERSION	2006-04-03 20:51:24.000000000 +0200
@@ -1 +1 @@
-2.13.35
+2.13.36
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/src/modules/BootArch.ycp new/yast2-bootloader-2.13.36/src/modules/BootArch.ycp
--- old/yast2-bootloader-2.13.35/src/modules/BootArch.ycp	2006-02-13 04:52:14.000000000 +0100
+++ new/yast2-bootloader-2.13.36/src/modules/BootArch.ycp	2006-04-03 20:43:21.000000000 +0200
@@ -13,7 +13,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: BootArch.ycp 27748 2006-02-08 15:15:11Z jplack $
+ * $Id: BootArch.ycp 29647 2006-04-03 18:43:13Z odabrunz $
  *
  */
 
@@ -45,15 +45,15 @@
     string ret = "";
     if (Arch::i386 ())
     {
-	ret = "showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off";
+	ret = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off";
     }
     else if (Arch::x86_64 ())
     {
-	ret = "showopts ide=nodma apm=off acpi=off noresume selinux=0 edd=off";
+	ret = "showopts ide=nodma apm=off acpi=off noresume edd=off";
     }
     else if (Arch::ia64 ())
     {
-	ret = "ide=nodma nohalt noresume selinux=0";
+	ret = "ide=nodma nohalt noresume";
     }
     else
     {
@@ -85,8 +85,7 @@
 	string resumestring = "";
 	if (resume != "")
 	    resumestring = sformat ("resume=%1", resume);
-	string ret = sformat ("%1 %2 %3 %4",
-	    "selinux=0",
+	string ret = sformat ("%1 %2 %3",
 	    Kernel::GetCmdLine (),
 	    resumestring,
 	    ProductFeatures::GetStringFeature (
@@ -99,8 +98,7 @@
     }
     else if (Arch::ia64 ())
     {
-	string append = sformat ("%1 %2 %3 splash=silent",
-	    "selinux=0",
+	string append = sformat ("%1 %2 splash=silent",
 	    ProductFeatures::GetStringFeature (
 		"globals",
 		"additional_kernel_parameters"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.36/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.13.35/src/modules/BootPOWERLILO.ycp	2006-04-01 23:05:49.000000000 +0200
+++ new/yast2-bootloader-2.13.36/src/modules/BootPOWERLILO.ycp	2006-04-03 20:40:51.000000000 +0200
@@ -14,7 +14,7 @@
  *      Joachim Plack <jplack@suse.de>
  *      Olaf Dabrunz <od@suse.de>
  *
- * $Id: BootPOWERLILO.ycp 29590 2006-03-31 14:28:39Z jplack $
+ * $Id: BootPOWERLILO.ycp 29645 2006-04-03 18:20:32Z jplack $
  *
  */
 
@@ -572,9 +572,11 @@
  * @return boolean true on success
  */
 global boolean Read (boolean reread) {
-    BootCommon::InitializeLibrary (reread, "ppc");
-    if (reread)
-    {
+    if (!BootCommon::InitializeLibrary (reread, "ppc")) {
+        // send current disk/partition information to perl-Bootloader
+	BootCommon::SetDiskInfo ();
+    }
+    if (reread) {
 	BootCommon::ReadFiles ();
     }
     // Do we have to detect disks ?
@@ -612,13 +614,21 @@
     }
 
     if (! BootCommon::InitializeLibrary (init, "ppc"))
-	return false;
+        // send current disk/partition information to perl-Bootloader
+	BootCommon::SetDiskInfo ();
+
     // Sanity check the sections list: we can only pass strings
     // through the perl interface
     list<map<string,string> > sects = maplist (map<string,any> s, BootCommon::sections, {
 	return (map<string,string>)
 	    filter (string k, any v, s, { return is (v, string); });
     });
+
+    // FIXME: remove all mountpoints of type 'boot/boot' through some Storage::<func>
+
+    // FIXME: set one mountpoint 'boot/boot' for every boot target means all
+    // partitions in 'boot_<arch>_custom' and 'clone' (chrp)
+
     // ret = ret && BootCommon::SetDeviceMap (device_mapping);
     ret = ret && BootCommon::SetSections (sects);
     ret = ret && BootCommon::SetGlobal (BootCommon::globals);
@@ -728,6 +738,12 @@
 	    sections_to_recreate = filter (string this_name,
 		sections_to_recreate, ``(this_name != oname)
 	    );
+	    // check for a new global default if oname != name
+	    if ( name == BootCommon::globals["default"]:"" ) {
+	        // we assume that the new name produced by CreateImageSection
+	        // will be oname
+  	        BootCommon::globals["default"] = oname;
+	    }
 	    return CreateImageSection(oname);
 	}
 
@@ -841,7 +857,7 @@
 
     // update device naming of default root and boot_* entries
     foreach (string key, ["root", "boot_prep_custom", "boot_chrp_custom",
-			  "boot_iseries_custom","boot_pmac_custom"], {
+			  "boot_iseries_custom","boot_pmac_custom", "clone"], {
 	if (haskey(BootCommon::globals, key)) {
 	    y2milestone ("Updating global %1= setting, currently %2",
 			 key, BootCommon::globals[key]:"");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/src/modules/BootZIPL.ycp new/yast2-bootloader-2.13.36/src/modules/BootZIPL.ycp
--- old/yast2-bootloader-2.13.35/src/modules/BootZIPL.ycp	2006-01-02 14:59:33.000000000 +0100
+++ new/yast2-bootloader-2.13.36/src/modules/BootZIPL.ycp	2006-04-03 20:43:21.000000000 +0200
@@ -12,7 +12,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: BootZIPL.ycp 26719 2005-12-22 10:50:59Z uli $
+ * $Id: BootZIPL.ycp 29647 2006-04-03 18:43:13Z odabrunz $
  *
  */
 
@@ -174,10 +174,9 @@
     global define void Propose () ``{
 	BootCommon::DetectDisks ();
 	string root_device = BootCommon::RootPartitionDevice;
-	string parameters = sformat ("%1 %3 %4 %5",
+	string parameters = sformat ("%1 %3 %4",
 	    StorageControllers::dasdParam,
 	    BootCommon::GetAdditionalKernelParams (),
-	    "selinux=0",
 	    "TERM=dumb");
 
 	BootCommon::globals = $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/src/routines/lib_iface.ycp new/yast2-bootloader-2.13.36/src/routines/lib_iface.ycp
--- old/yast2-bootloader-2.13.35/src/routines/lib_iface.ycp	2006-03-20 14:35:22.000000000 +0100
+++ new/yast2-bootloader-2.13.36/src/routines/lib_iface.ycp	2006-04-03 20:43:21.000000000 +0200
@@ -11,7 +11,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: lib_iface.ycp 29144 2006-03-20 09:39:37Z jplack $
+ * $Id: lib_iface.ycp 29647 2006-04-03 18:43:13Z odabrunz $
  *
  * WARNING:
  *      To be included to BootCommon.ycp only
@@ -33,22 +33,17 @@
 string library_initialized = nil;
 
 /**
- * Prepare the data for perl-Bootloader library initialization
- * @return a map of data needed for the library initialization
+ *  Retrieve the data for perl-Bootloader library from Storage module
+ *  and pass it along
+ *  @return nothing
  */
-map<string,any> PrepareInitData () {
+// FIXME: this should be done directly in perl-Bootloader through LibStorage.pm
+global void SetDiskInfo () {
     map<string,any> mountpoints = mapmap (string k, list v,
 	(map<string,list>)Storage::GetMountPoints (),
     {
 	return $[ k : (any)v[0]:nil];
     });
-    // get what's really mounted
-    list<map<string,any> > mounted_list = (list<map<string,any> >)
-	SCR::Read (.proc.mounts);
-    map<string,string> mounted = listmap (map<string,any> m, mounted_list, {
-	return $[ m["file"]:"" : m["spec"]:"" ];
-    });
-    y2milestone ("Really mounted: %1", mounted);
     mountpoints = filter (string k, any v, mountpoints, {
 	string tmpdir = (string)SCR::Read (.target.tmpdir);
 	integer tmp_sz = size (tmpdir);
@@ -56,6 +51,13 @@
     });
     if (! Stage::initial ())
     {
+        // get what's really mounted
+        list<map<string,any> > mounted_list = (list<map<string,any> >)
+	    SCR::Read (.proc.mounts);
+	map<string,string> mounted = listmap (map<string,any> m, mounted_list, {
+	    return $[ m["file"]:"" : m["spec"]:"" ];
+	});
+	y2milestone ("Really mounted: %1", mounted);
 	mountpoints = filter (string k, any v, mountpoints, {
 	    return mounted[k]:nil == v;
 	});
@@ -68,6 +70,8 @@
     {
 	if (info["type"]:`CT_UNKNOWN==`CT_LVM)
 	    return [];
+	if (info["type"]:`CT_UNKNOWN==`CT_EVMS)
+	    return [];
 	list partitions = info["partitions"]:[];
 	list<list> parts = maplist (map p, (list<map>)partitions, {
 	    string raid = "";
@@ -105,11 +109,9 @@
     y2milestone ("Information about partitioning: %1", partinfo);
     y2milestone ("Information about MD arrays: %1", md_info);
 
-    return $[
-	"mountpoints" : mountpoints,
-	"partitions" : partinfo,
-	"md_arrays" : md_info,
-    ];
+    System::Bootloader_API::setMountPoints ((map<string,string>) mountpoints);
+    System::Bootloader_API::setPartitions ((list<list<string> >) partinfo);
+    System::Bootloader_API::setMDArrays ((map<string,list<string> >) md_info);
 }
 
 /**
@@ -120,21 +122,16 @@
  */
 global boolean InitializeLibrary (boolean force, string loader) {
     if (!force && loader == library_initialized)
-        return true;
+        return false;
 
     y2milestone ("Initializing lib for %1", loader);
     System::Bootloader_API::initBootloader (loader);
     y2milestone ("Putting partitioning into library");
-    map<string,any> init_data = PrepareInitData ();
-    map<string,string> mountpoints = init_data["mountpoints"]:$[];
-    list<list<string> > partitions = init_data["partitions"]:[];
-    map<string,list<string> > md_arrays = init_data["md_arrays"]:$[];
-    System::Bootloader_API::setMountPoints (mountpoints);
-    System::Bootloader_API::setPartitions (partitions);
-    System::Bootloader_API::setMDArrays (md_arrays);
+    // pass all needed disk/partition information to library
+    SetDiskInfo();
     y2milestone ("Library initialization finished");
     library_initialized = loader;
-    return true; // FIXME error checking
+    return true;
 }
 
 /**


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)