commit yast2-bootloader

2 Apr 2006

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Sun Apr 2 11:50:35 CEST 2006.

--------

--- yast2-bootloader/yast2-bootloader.changes	2006-03-29 18:54:46.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes	2006-04-01 23:27:58.000000000 +0200
@@ -1,0 +2,12 @@
+Sat Apr  1 23:25:58 CEST 2006 - od@suse.de
+
+- added TESTME comment: test parted partition activation with BSD
+  slices
+- remove more old-style backticks
+- add needed comments
+- added parted to Requires (#161316)
+- changed a y2internal -> y2milestone
+- fixed harmless typos
+- 2.13.35
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.Bt3ETg/_old	2006-04-02 11:50:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Bt3ETg/_new	2006-04-02 11:50:02.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-bootloader (Version 2.13.34)
+# spec file for package yast2-bootloader (Version 2.13.35)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,16 +11,16 @@
 # norootforbuild
 
 Name:           yast2-bootloader
-Version:        2.13.34
+Version:        2.13.35
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-bootloader-2.13.34.tar.bz2
+Source0:        yast2-bootloader-2.13.35.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
-Requires:       yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader
+Requires:       yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader parted
 %ifarch %ix86 x86_64
 Requires:       master-boot-code
 %endif
@@ -60,7 +60,7 @@
     Dan Meszaros
 
 %prep
-%setup -n yast2-bootloader-2.13.34
+%setup -n yast2-bootloader-2.13.35
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,15 @@
 /usr/share/YaST2/clients/bootfloppy.ycp
 
 %changelog -n yast2-bootloader
+* Sat Apr 01 2006 - od@suse.de
+- added TESTME comment: test parted partition activation with BSD
+  slices
+- remove more old-style backticks
+- add needed comments
+- added parted to Requires (#161316)
+- changed a y2internal -> y2milestone
+- fixed harmless typos
+- 2.13.35
 * Wed Mar 29 2006 - od@suse.de
 - using parted for activation of boot partition now (instead of
   /sbin/activate from the lilo package) (#161316)

++++++ yast2-bootloader-2.13.34.tar.bz2 -> yast2-bootloader-2.13.35.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/VERSION new/yast2-bootloader-2.13.35/VERSION
--- old/yast2-bootloader-2.13.34/VERSION	2006-03-29 18:52:03.000000000 +0200
+++ new/yast2-bootloader-2.13.35/VERSION	2006-04-01 23:25:39.000000000 +0200
@@ -1 +1 @@
-2.13.34
+2.13.35
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/src/modules/BootELILO.ycp new/yast2-bootloader-2.13.35/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.13.34/src/modules/BootELILO.ycp	2006-03-17 23:43:43.000000000 +0100
+++ new/yast2-bootloader-2.13.35/src/modules/BootELILO.ycp	2006-03-30 16:50:27.000000000 +0200
@@ -13,7 +13,7 @@
  *      Jiri Srain <jsrain@suse.cz>
  *      Andreas Schwab <schwab@suse.de>
  *
- * $Id: BootELILO.ycp 28904 2006-03-13 15:35:23Z jplack $
+ * $Id: BootELILO.ycp 29574 2006-03-30 14:50:24Z odabrunz $
  *
  */
 
@@ -211,7 +211,7 @@
 	boolean ret = BootCommon::Read (reread);
 	efi_entry_name
 	    = (string)SCR::Read (.sysconfig.bootloader.LOADER_LOCATION);
-	y2internal ("EFI entry: %1", efi_entry_name);
+	y2milestone ("EFI entry: %1", efi_entry_name);
 	// check for meaningless EFI entry name in sysconfig
 	if ("mbr" == efi_entry_name || "" == efi_entry_name
 	    || nil == efi_entry_name)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.35/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.13.34/src/modules/BootPOWERLILO.ycp	2006-03-21 17:41:44.000000000 +0100
+++ new/yast2-bootloader-2.13.35/src/modules/BootPOWERLILO.ycp	2006-04-01 23:05:49.000000000 +0200
@@ -14,7 +14,7 @@
  *      Joachim Plack <jplack@suse.de>
  *      Olaf Dabrunz <od@suse.de>
  *
- * $Id: BootPOWERLILO.ycp 29231 2006-03-21 16:38:03Z jplack $
+ * $Id: BootPOWERLILO.ycp 29590 2006-03-31 14:28:39Z jplack $
  *
  */
 
@@ -93,7 +93,7 @@
 
 // misc. functions
 
-global define void initBoardType () ``{
+global define void initBoardType () {
     if (Arch::board_iseries ())
     {
 	board_type = "iseries";
@@ -120,13 +120,13 @@
     }
 }
 
-global define string getBoardType () ``{
+global define string getBoardType () {
 	if (board_type == nil)
 	    initBoardType ();
 	return board_type;
 }
 
-global define void setBoardType (string board) ``{
+global define void setBoardType (string board) {
 	board_type = board;
 	currentBoardInit ();
 }
@@ -134,7 +134,7 @@
 /**
   * Initialize the attribute of currently used board type
   */
- global define void currentBoardInit () ``{
+ global define void currentBoardInit () {
      if (getBoardType () == "iseries")
      {
        iSeriesInit ();
@@ -414,7 +414,7 @@
 /**
   * Propose bootloader settings
   */
-global define void Propose () ``{
+global define void Propose () {
     y2debug ("Started propose: Glob: %1, Sec: %2",
 	BootCommon::globals, BootCommon::sections);
 
@@ -474,7 +474,7 @@
     /**
       * Propose bootloader settings
       *
-    global define void Propose () ``{
+    global define void Propose () {
 	boolean initial_propose = true;
 	if (BootCommon::was_proposed)
 	{
@@ -544,7 +544,7 @@
   * Export bootloader settings to a map
   * @return bootloader settings
   */
-global define map Export () ``{
+global define map Export () {
     map exp = $[
 		"global": BootCommon::globals,
 		"sections" : BootCommon::sections,
@@ -559,7 +559,7 @@
   * @param settings map of bootloader settings
   * @return boolean true on success
   */
-global define boolean Import (map settings) ``{
+global define boolean Import (map settings) {
     BootCommon::globals = settings["global"]:$[];
     BootCommon::sections = settings["sections"]:[];
     BootCommon::activate = settings["activate"]:false;
@@ -606,7 +606,8 @@
     if (clean)
     {
 	BootCommon::RemoveUnexistentSections ("", "");
-	BootCommon::UpdateInitrdLine ();
+	// FIXME: this is not needed, unclear code
+	// BootCommon::UpdateInitrdLine ();
 	BootCommon::UpdateAppend ();
     }
 
@@ -724,9 +725,9 @@
 	// if we find a section that looks like it has been initially proposed
 	// from the installer, replace with the actual "good" proposal
 	if (contains(sections_to_recreate, oname)) {
-	    sections_to_recreate = filter (string this_name, sections_to_recreate, ``(
-		this_name != oname
-	    ));
+	    sections_to_recreate = filter (string this_name,
+		sections_to_recreate, ``(this_name != oname)
+	    );
 	    return CreateImageSection(oname);
 	}
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/src/ppc/misc.ycp new/yast2-bootloader-2.13.35/src/ppc/misc.ycp
--- old/yast2-bootloader-2.13.34/src/ppc/misc.ycp	2006-03-07 22:16:46.000000000 +0100
+++ new/yast2-bootloader-2.13.35/src/ppc/misc.ycp	2006-03-30 16:43:27.000000000 +0200
@@ -11,7 +11,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: misc.ycp 28675 2006-03-07 21:16:39Z odabrunz $
+ * $Id: misc.ycp 29550 2006-03-30 09:01:31Z mvidner $
  *
  */
 
@@ -119,7 +119,7 @@
 	    map<string,map> tm = Storage::GetTargetMap ();
 	    string vg = "";
 	    foreach (string dev, map info, tm, {
-		if (info["type"]:`CT_UNKNONW==`CT_LVM)
+		if (info["type"]:`CT_UNKNOWN==`CT_LVM)
 		{
 		    list<map> volumes = info["partitions"]:[];
 		    foreach (map v, volumes, {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/src/routines/misc.ycp new/yast2-bootloader-2.13.35/src/routines/misc.ycp
--- old/yast2-bootloader-2.13.34/src/routines/misc.ycp	2006-03-29 18:23:36.000000000 +0200
+++ new/yast2-bootloader-2.13.35/src/routines/misc.ycp	2006-04-01 23:25:23.000000000 +0200
@@ -11,7 +11,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: misc.ycp 29538 2006-03-29 16:23:31Z odabrunz $
+ * $Id: misc.ycp 29603 2006-04-01 21:25:19Z odabrunz $
  *
  * WARNING:
  *      To be included to BootCommon.ycp only, requires function
@@ -243,12 +243,12 @@
 	list<string> floppies = getFloppyDevices ();
 
 	devices = filter (string k, map v, devices,
-	                  ``(v["type"]:`CT_UNKNONW != `CT_LVM));
+	                  ``(v["type"]:`CT_UNKNOWN != `CT_LVM));
 
 	if (type == `boot || type == `boot_other)
 	{
 	    devices = filter (string k, map v, devices, 
-	                      ``(v["type"]:`CT_UNKNONW == `CT_DISK));
+	                      ``(v["type"]:`CT_UNKNOWN == `CT_DISK));
 	}
 	list<string> all_disks = (list<string>) maplist (string k, map v, devices, ``(k));
 
@@ -510,6 +510,8 @@
 	string dev = "";
 	string mp = "";
 	integer max = 0;
+	//
+	// FIXME: this is broken code, implement a proper prefix match!! see below
 	foreach (string k, list v, mountpoints, ``{
 	    if (k != "swap" && issubstring (fullpth, k) && size (k) > max)
 	    {
@@ -521,6 +523,7 @@
 	if (mp == "")
 	    return [];
 
+	// FIXME: pth will be wrong for fullpth=='(hd0,1)/boot/vmlinux' !!
 	string pth = substring (fullpth, size (mp));
 	if (substring (pth, 0, 1) != "/")
 	    pth = "/" + pth;
@@ -1094,6 +1097,13 @@
 		    y2milestone ("Activating partition %1 on %2", num, mbr_dev);
 		    // FIXME: this is the most rotten code since molded sliced bread
 		    // move to bootloader/Core/GRUB.pm or similar
+		    // TESTME: make sure that parted does not destroy BSD
+		    // slices (#suse24740): cf. section 5.1 of "info parted":
+		    //   Parted only supports the BSD disk label system.
+		    //   Parted is unlikely to support the partition slice
+		    //   system in the future because the semantics are rather
+		    //   strange, and don't work like "normal" partition tables
+		    //   do.
 		    string command = sformat
 			("/usr/sbin/parted -s %1 set %2 boot on", mbr_dev, num);
 		    y2milestone ("Running command %1", command);


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)