Author: fehr Date: Wed Feb 13 19:06:51 2008 New Revision: 44431 URL: http://svn.opensuse.org/viewcvs/yast?rev=44431&view=rev Log: - fix bug during sync between EVMS and LVM container (#354415) - version 2.13.98 Modified: branches/SuSE-SLE-10-SP2-Branch/storage/VERSION branches/SuSE-SLE-10-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/storage/VERSION?rev=44431&r1=44430&r2=44431&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/storage/VERSION Wed Feb 13 19:06:51 2008 @@ -1 +1 @@ -2.13.97 +2.13.98 Modified: branches/SuSE-SLE-10-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/storage/libstorage/src/Storage.cc?rev=44431&r1=44430&r2=44431&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/storage/libstorage/src/Storage.cc Wed Feb 13 19:06:51 2008 @@ -2488,6 +2488,35 @@ p->type()==EXTENDED ); ++vi; } + ep = evCoPair(evmsCo); + coi = ep.begin(); + list<string> rem_co; + while( coi!=ep.end()) + { + if( coi->name().find( "lvm/" )==0 || + coi->name().find( "lvm2/" )==0 ) + { + string n = coi->name(); + y2mil("n:"<deleted()) + rem_co.push_back( coi->device() ); + } + ++coi; + } + if( rem_co.size()>0 ) + { + y2mil("rem_co:" << rem_co); + for( list<string>::iterator s = rem_co.begin(); + s!=rem_co.end(); s++ ) + { + ContIterator cc; + if( findContainer( *s, cc )) + removeContainer( &(*cc) ); + } + } std::map::iterator i=backups.find("initial"); if( !evCoPair().empty() && i!=backups.end() ) { Modified: branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes?rev=44431&r1=44430&r2=44431&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes Wed Feb 13 19:06:51 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 13 19:04:56 CET 2008 - fehr@suse.de + +- fix bug during sync between EVMS and LVM container (#354415) +- version 2.13.98 + +------------------------------------------------------------------- Wed Jan 16 13:13:33 CET 2008 - fehr@suse.de - make sure NFS entries in fstab get zero passno field -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org