Author: aschnell Date: Tue Aug 5 14:31:38 2008 New Revision: 49707 URL: http://svn.opensuse.org/viewcvs/yast?rev=49707&view=rev Log: - remove more evms code Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageTypes.h Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=49707&r1=49706&r2=49707&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Tue Aug 5 14:31:38 2008 @@ -2277,8 +2277,7 @@ } if( ret==0 && p->type()!=EXTENDED ) { - bool used_as_pv = p->getUsedByType()==UB_EVMS || - p->getUsedByType()==UB_LVM; + bool used_as_pv = p->getUsedByType() == UB_LVM; y2milestone( "zeroNew:%d used_as_pv:%d", getStorage()->getZeroNewPartitions(), used_as_pv ); if( used_as_pv || getStorage()->getZeroNewPartitions() ) Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?rev=49707&r1=49706&r2=49707&view=diff ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Tue Aug 5 14:31:38 2008 @@ -622,8 +622,7 @@ getStorage()->waitForDevice( m->device() ); getMdData( m->nr() ); updateEntry( m ); - bool used_as_pv = m->getUsedByType()==UB_EVMS || - m->getUsedByType()==UB_LVM; + bool used_as_pv = m->getUsedByType() == UB_LVM; y2milestone( "zeroNew:%d used_as_pv:%d", getStorage()->getZeroNewPartitions(), used_as_pv ); if( used_as_pv || getStorage()->getZeroNewPartitions() ) Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=49707&r1=49706&r2=49707&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Aug 5 14:31:38 2008 @@ -3827,8 +3827,9 @@ co.type()==DMRAID ); } -bool Storage::removeDmMapsTo( const string& dev, bool also_evms ) +bool Storage::removeDmMapsTo( const string& dev ) { + bool also_evms = false; bool ret = false; y2milestone( "dev:%s also_evms:%d", dev.c_str(), also_evms ); VPair vp = vPair( isDmContainer ); Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h?rev=49707&r1=49706&r2=49707&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Tue Aug 5 14:31:38 2008 @@ -444,7 +444,7 @@ void removeDmTableTo( const Volume& vol ); void removeDmTableTo( const string& device ); bool removeDmTable( const string& table ); - bool removeDmMapsTo( const string& dev, bool also_evms=false ); + bool removeDmMapsTo( const string& dev ); bool checkDmMapsTo( const string& dev ); void updateDmEmptyPeMap(); void dumpObjectList(); Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTypes.h?rev=49707&r1=49706&r2=49707&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Tue Aug 5 14:31:38 2008 @@ -122,9 +122,6 @@ case storage::UB_MD: st = "md"; break; - case storage::UB_EVMS: - st = "evms"; - break; case storage::UB_DM: st = "dm"; break; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org