Hello community,
here is the log from the commit of package yast2-storage
checked in at Tue May 9 19:16:04 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-05-08 18:13:42.000000000 +0200
+++ STABLE/yast2-storage/yast2-storage.changes 2006-05-09 13:14:15.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 9 13:14:03 CEST 2006 - fehr@suse.de
+
+- additional fixes for generic dm devices
+- version 2.13.61
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.13.60.tar.bz2
New:
----
yast2-storage-2.13.61.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.ZSBMpj/_old 2006-05-09 19:15:54.000000000 +0200
+++ /var/tmp/diff_new_pack.ZSBMpj/_new 2006-05-09 19:15:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.13.60)
+# spec file for package yast2-storage (Version 2.13.61)
#
# 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-storage
-Version: 2.13.60
+Version: 2.13.61
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.13.60.tar.bz2
+Source0: yast2-storage-2.13.61.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-storage-2.13.60
+%setup -n yast2-storage-2.13.61
%build
%{prefix}/bin/y2tool y2autoconf
@@ -164,6 +164,9 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%changelog -n yast2-storage
+* Tue May 09 2006 - fehr@suse.de
+- additional fixes for generic dm devices
+- version 2.13.61
* Mon May 08 2006 - fehr@suse.de
- fix wrong warning text on deletion of extended partition (#173406)
- add edd module to INITRD_MODULES if it is loaded
++++++ yast2-storage-2.13.60.tar.bz2 -> yast2-storage-2.13.61.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.60/VERSION new/yast2-storage-2.13.61/VERSION
--- old/yast2-storage-2.13.60/VERSION 2006-05-08 16:13:27.000000000 +0200
+++ new/yast2-storage-2.13.61/VERSION 2006-05-09 13:14:19.000000000 +0200
@@ -1 +1 @@
-2.13.60
+2.13.61
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.60/libstorage/src/Dm.cc new/yast2-storage-2.13.61/libstorage/src/Dm.cc
--- old/yast2-storage-2.13.60/libstorage/src/Dm.cc 2006-05-08 18:21:42.000000000 +0200
+++ new/yast2-storage-2.13.61/libstorage/src/Dm.cc 2006-05-09 12:49:47.000000000 +0200
@@ -128,6 +128,31 @@
else
{
y2warning( "unknown target type \"%s\"", target.c_str() );
+ extractNthWord( 1, line ) >> le;
+ le /= 2;
+ le += pesize-1;
+ le /= pesize;
+ list<string> sl = splitString( extractNthWord( 2, line, true ));
+ y2mil( "sl:" << sl );
+ Regex devspec( "^[0-9]+:[0-9]+$" );
+ for( list<string>::const_iterator i=sl.begin(); i!=sl.end(); ++i )
+ {
+ if( devspec.match( *i ))
+ {
+ y2mil( "match \"" << *i << "\"" );
+ dev = getDevice( *i );
+ if( !dev.empty() )
+ {
+ if( (mit=pe_map.find( dev ))==pe_map.end() )
+ pe_map[dev] = le;
+ else
+ mit->second += le;
+ }
+ else
+ y2warning( "could not find major/minor pair %s",
+ majmin.c_str());
+ }
+ }
}
}
}
@@ -275,6 +300,7 @@
alt_names.push_back( d );
}
}
+ num = mnr;
}
const PeContainer* const Dm::pec() const
@@ -447,6 +473,7 @@
s << *(Volume*)&p;
s << " LE:" << p.num_le;
s << " Table:" << p.tname;
+ s << " Target:" << p.target;
if( p.inactiv>1 )
{
s << " inactive";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.60/libstorage/src/DmCo.cc new/yast2-storage-2.13.61/libstorage/src/DmCo.cc
--- old/yast2-storage-2.13.60/libstorage/src/DmCo.cc 2006-05-08 18:27:39.000000000 +0200
+++ new/yast2-storage-2.13.61/libstorage/src/DmCo.cc 2006-05-09 12:51:43.000000000 +0200
@@ -36,6 +36,30 @@
y2debug( "destructed DmCo" );
}
+void DmCo::updateDmMaps()
+ {
+ DmPair dp = dmPair();
+ bool success;
+ do
+ {
+ success = false;
+ for( DmIter i=dp.begin(); i!=dp.end(); ++i )
+ {
+ if( i->getPeMap().empty() )
+ {
+ y2mil( "dm:" << *i );
+ i->getTableInfo();
+ if( !i->getPeMap().empty() )
+ {
+ success = true;
+ y2mil( "dm:" << *i );
+ }
+ }
+ }
+ }
+ while( success );
+ }
+
void
DmCo::init()
{
@@ -78,7 +102,9 @@
if( (pos=minor.find( ")" ))!=string::npos )
minor.erase( pos );
minor >> min_num;
+ y2mil( "minor:\"" << minor << "\" minor:" << min_num );
Dm * m = new Dm( *this, table, min_num );
+ y2mil( "new Dm:" << *m );
unsigned long long s = 0;
string dev = "/dev/dm-" + decString(min_num);
if( ppart.getSize( dev, s ))
@@ -88,16 +114,18 @@
}
bool in_use = false;
const map