commit yast2-bootloader

18 May 2006

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Thu May 18 02:22:06 CEST 2006.

--------

--- yast2-bootloader/yast2-bootloader.changes	2006-05-17 16:53:32.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes	2006-05-17 22:43:59.000000000 +0200
@@ -1,0 +2,9 @@
+Wed May 17 22:42:52 CEST 2006 - od@suse.de
+
+- fix backwards mapping of "mount by" device names when bl
+  configuration is read (#176201)
+- revert last change in MountByDev2Dev() and use y2milestone()
+  again
+- 2.13.63
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.nwy4Ph/_old	2006-05-18 02:21:51.000000000 +0200
+++ /var/tmp/diff_new_pack.nwy4Ph/_new	2006-05-18 02:21:51.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-bootloader (Version 2.13.62)
+# spec file for package yast2-bootloader (Version 2.13.63)
 #
 # 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.62
+Version:        2.13.63
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-bootloader-2.13.62.tar.bz2
+Source0:        yast2-bootloader-2.13.63.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.62
+%setup -n yast2-bootloader-2.13.63
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -112,6 +112,12 @@
 
 %changelog -n yast2-bootloader
 * Wed May 17 2006 - od@suse.de
+- fix backwards mapping of "mount by" device names when bl
+  configuration is read (#176201)
+- revert last change in MountByDev2Dev() and use y2milestone()
+  again
+- 2.13.63
+* Wed May 17 2006 - od@suse.de
 - added bootloader device conversion for mount by ID, UUID etc. to
   BootPOWERLILO (#174349)
 - added debug messages to Dev2MountByDev()

++++++ yast2-bootloader-2.13.62.tar.bz2 -> yast2-bootloader-2.13.63.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.62/VERSION new/yast2-bootloader-2.13.63/VERSION
--- old/yast2-bootloader-2.13.62/VERSION	2006-05-17 16:52:07.000000000 +0200
+++ new/yast2-bootloader-2.13.63/VERSION	2006-05-17 22:42:43.000000000 +0200
@@ -1 +1 @@
-2.13.62
+2.13.63
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.62/src/routines/misc.ycp new/yast2-bootloader-2.13.63/src/routines/misc.ycp
--- old/yast2-bootloader-2.13.62/src/routines/misc.ycp	2006-05-17 16:52:01.000000000 +0200
+++ new/yast2-bootloader-2.13.63/src/routines/misc.ycp	2006-05-17 22:42:39.000000000 +0200
@@ -12,7 +12,7 @@
  *      Jiri Srain <jsrain@suse.cz>
  *      Olaf Dabrunz <od@suse.de>
  *
- * $Id: misc.ycp 30978 2006-05-17 14:51:57Z odabrunz $
+ * $Id: misc.ycp 30988 2006-05-17 20:42:33Z odabrunz $
  *
  * WARNING:
  *      To be included to BootCommon.ycp only, requires function
@@ -222,7 +222,7 @@
 
     /**
      * Converts a "/dev/disk/by-" device name to the corresponding kernel
-     * device name, according to the "mountby" setting for the device from
+     * device name, if a mapping for this name can be found in the map from
      * yast2-storage. If the given device name is not a "/dev/disk/by-" device
      * name, it is left unchanged. Also, if the information about the device
      * name cannot be found in the target map from yast2-storage, the device
@@ -239,35 +239,36 @@
 
 	map<string,map> devices = (map<string,map>)Storage::GetTargetMap();
 
-	// make a map: "type/identifier" -> info_map_for_this_partition
-	// e.g.: "id/scsi-SATA_ST3120813AS_3LS09W21-part5" -> info_map_for_this_partition
-	symbol mountby = `device;
-	map<string,map> partitions = $[];
+	// make a map: "type/identifier" -> kernel_device_name
+	// e.g.: "id/scsi-SATA_ST3120813AS_3LS09W21-part5" -> "/dev/sda2"
+	map<string,string> partitions = $[];
 	foreach (string k, map v, devices, ``{
 	    foreach (map p, (list<map>)(v["partitions"]:[]), ``{
-		mountby = (symbol) p["mountby"]:nil;
-		if ( mountby == `uuid )
+		if ( haskey(p, "uuid") )
 		{
-		    partitions["uuid/" + p["uuid"]:""] = p;
-		} else if ( mountby == `label )
+		    partitions["uuid/" + p["uuid"]:""] = p["device"]:dev;
+		}
+		if ( haskey(p, "label") )
 		{
-		    partitions["label/" + p["label"]:""] = p;
-		} else if ( mountby == `id )
+		    partitions["label/" + p["label"]:""] = p["device"]:dev;
+		}
+		if ( haskey(p, "udev_id") )
 		{
-		    partitions["id/" + p["udev_id", 0]:""] = p;
-		} else if ( mountby == `path )
+		    partitions["id/" + p["udev_id", 0]:""] = p["device"]:dev;
+		}
+		if ( haskey(p, "udev_path") )
 		{
-		    partitions["path/" + p["udev_path"]:""] = p;
+		    partitions["path/" + p["udev_path"]:""] = p["device"]:dev;
 		}
 	    });
 	});
-	y2debug ("MountByDev2Dev: partitions %1", partitions);
+	y2milestone ("MountByDev2Dev: partitions %1", partitions);
 
 	// ident is "id/<id>", "path/<path>", "uuid/<uuid>" or "label/<label>"
 	string ident = regexpsub(dev, "^/dev/disk/by-(.*)", "\\1");
-	y2debug ("MountByDev2Dev: ident %1", ident);
+	y2milestone ("MountByDev2Dev: ident %1", ident);
 	// if exists, get the kernel name, otherwise leave unchanged
-	string ret = partitions[ident, "device"]:dev;
+	string ret = partitions[ident]:dev;
 
 	y2milestone ("MountByDev2Dev: ret %1", ret);
 	return ret;


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)