Hello community,
here is the log from the commit of package yast2-update
checked in at Fri Feb 2 16:13:04 CET 2007.
--------
--- yast2-update/yast2-update.changes 2007-01-04 14:35:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-02-01 12:58:25.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Jan 31 16:28:45 CET 2007 - locilka@suse.cz
+
+- Fixed update of system on EVMS: '/dev/abc/xyz' is the same
+ as '/dev/evms/lvm2/abc/xyz' (#237139).
+- 2.15.2
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.15.1.tar.bz2
New:
----
yast2-update-2.15.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.E13521/_old 2007-02-02 16:12:53.000000000 +0100
+++ /var/tmp/diff_new_pack.E13521/_new 2007-02-02 16:12:53.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.15.1)
+# spec file for package yast2-update (Version 2.15.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-update
-Version: 2.15.1
+Version: 2.15.2
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.15.1.tar.bz2
+Source0: yast2-update-2.15.2.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml
Requires: yast2 yast2-installation yast2-storage yast2-packager
@@ -40,7 +40,7 @@
Jiri Srain
%prep
-%setup -n yast2-update-2.15.1
+%setup -n yast2-update-2.15.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,10 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog -n yast2-update
+* Wed Jan 31 2007 - locilka@suse.cz
+- Fixed update of system on EVMS: '/dev/abc/xyz' is the same
+ as '/dev/evms/lvm2/abc/xyz' (#237139).
+- 2.15.2
* Thu Jan 04 2007 - locilka@suse.cz
- Added documentation for new features in control file:
* boolean delete_old_packages and list of products for which this
++++++ yast2-update-2.15.1.tar.bz2 -> yast2-update-2.15.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.1/src/modules/RootPart.ycp new/yast2-update-2.15.2/src/modules/RootPart.ycp
--- old/yast2-update-2.15.1/src/modules/RootPart.ycp 2007-01-04 14:35:32.000000000 +0100
+++ new/yast2-update-2.15.2/src/modules/RootPart.ycp 2007-01-31 16:29:17.000000000 +0100
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 35065 2007-01-04 13:35:30Z locilka $
+ * $Id: RootPart.ycp 35745 2007-01-31 15:29:16Z locilka $
*/
{
module "RootPart";
@@ -422,6 +422,30 @@
return true;
}
+ // bugzilla #237139
+ // '/dev/evms/lvm2/system/root' is the same as '/dev/system/root'
+ // the root from /etc/fstab must be used
+ if (regexpmatch (root["spec"]:"", "/dev/evms/lvm2/") || regexpmatch (partition, "/dev/evms/lvm2/")) {
+ y2milestone ("Special case with EVMS: %1 vs. %2", root["spec"]:"", partition);
+
+ string tmp_rootspec = root["spec"]:"";
+ string tmp_partition = partition;
+
+ // they might be the same but this case covers it as well
+ if (regexpmatch (root["spec"]:"", "/dev/evms/lvm2/"))
+ tmp_rootspec = regexpsub (root["spec"]:"", "/dev/evms/lvm2/(.*)$", "/dev/\\1");
+ if (regexpmatch (partition, "/dev/evms/lvm2/"))
+ tmp_partition = regexpsub (partition, "/dev/evms/lvm2/(.*)$", "/dev/\\1");
+
+ y2milestone ("Checking '%1' vs. '%2'", tmp_rootspec, tmp_partition);
+
+ if (tmp_rootspec == tmp_partition) {
+ found_partition = root["spec"]:"";
+ y2milestone ("EVMS case matching, using %1", found_partition);
+ return true;
+ }
+ }
+
if (root["spec"]:"" != partition)
{
y2error ("root partition in fstab has wrong device");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.1/VERSION new/yast2-update-2.15.2/VERSION
--- old/yast2-update-2.15.1/VERSION 2007-01-04 14:29:01.000000000 +0100
+++ new/yast2-update-2.15.2/VERSION 2007-02-01 12:58:32.000000000 +0100
@@ -1 +1 @@
-2.15.1
+2.15.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org