Author: fehr Date: Tue Jan 24 17:56:14 2012 New Revision: 67269 URL: http://svn.opensuse.org/viewcvs/yast?rev=67269&view=rev Log: remove btrfs volumes when partition table gets destroyed (bnc#742491) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc?rev=67269&r1=67268&r2=67269&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc Tue Jan 24 17:56:14 2012 @@ -477,7 +477,7 @@ Btrfs *b = dynamic_cast(v); if( b != NULL ) { - if( !silent ) + if( !b->isSilent() ) { getStorage()->showInfoCb( b->removeText(true) ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc?rev=67269&r1=67268&r2=67269&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc Tue Jan 24 17:56:14 2012 @@ -1393,6 +1393,8 @@ { if( (*j)->created() ) { + if( (*j)->isUsedBy() ) + getStorage()->removeUsing( (*j)->device(), (*j)->getUsedBy() ); delete( *j ); j = vols.erase( j ); } @@ -1625,6 +1627,8 @@ y2mil( "rem:" << *i ); if( !i->created() ) l.push_front( i ); + else if( i->isUsedBy() ) + getStorage()->removeUsing( i->device(), i->getUsedBy() ); } for( list<VolIterator>::const_iterator i=l.begin(); i!=l.end(); ++i ) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=67269&r1=67268&r2=67269&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jan 24 17:56:14 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 24 17:55:44 CET 2012 - fehr@suse.de + +- remove btrfs volumes when partition table gets destroyed (bnc#742491) + +------------------------------------------------------------------- Tue Jan 24 14:15:29 CET 2012 - aschnell@suse.de - do not query user to autostart multipath in AutoYaST (bnc#742913) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp?rev=67269&r1=67268&r2=67269&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Tue Jan 24 17:56:14 2012 @@ -4655,6 +4655,7 @@ if (ret != save_chtxt) { + LibStorage::StorageInterface::dumpObjectList(sint); LibStorage::StorageInterface::dumpCommitInfos(sint); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org