Author: aschnell Date: Tue Aug 5 15:12:53 2008 New Revision: 49710 URL: http://svn.opensuse.org/viewcvs/yast?rev=49710&view=rev Log: - removed more evms code Modified: trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev=49710&r1=49709&r2=49710&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Tue Aug 5 15:12:53 2008 @@ -220,13 +220,6 @@ } while( ret.empty() && mj==dm_major && c.retcode()==0 ); } - if( ret.find( "/dev/evms/" )==0 ) - { - string tmp( ret ); - tmp.erase( 5, 5 ); - if( cont->getStorage()->knownDevice( tmp, true ) ) - ret = tmp; - } return( ret ); } Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?rev=49710&r1=49709&r2=49710&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Tue Aug 5 15:12:53 2008 @@ -109,7 +109,6 @@ void DmCo::getDmData( ProcPart& ppart ) { - Storage::ConstEvmsPair ev = getStorage()->evmsPair(); Storage::ConstLvmLvPair lv = getStorage()->lvmLvPair(); Storage::ConstDmraidCoPair dmrco = getStorage()->dmraidCoPair(); Storage::ConstDmraidPair dmr = getStorage()->dmrPair(); @@ -128,15 +127,6 @@ } if( !found ) { - Storage::ConstEvmsIterator i=ev.begin(); - while( !found && i!=ev.end() ) - { - found = i->getTableName()==table; - ++i; - } - } - if( !found ) - { Storage::ConstDmraidCoIterator i=dmrco.begin(); while( !found && i!=dmrco.end() ) { Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=49710&r1=49709&r2=49710&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Aug 5 15:12:53 2008 @@ -228,15 +228,6 @@ void Storage::detectObjects() { ProcPart* ppart = new ProcPart; - if( EvmsCo::canDoEvms() ) - { - const char * file = "/etc/evms.conf"; - if( access( file, R_OK )==0 ) - { - SystemCmd cmd( (string)"grep exclude " + file ); - } - EvmsCo::activate(true); - } detectDisks( *ppart ); if( instsys() ) { @@ -276,9 +267,6 @@ detectNfs( pm ); detectFsData( vBegin(), vEnd(), pm ); } - EvmsCoIterator e = findEvmsCo( "" ); - if( e!=evCoEnd() ) - e->updateMd(); if( instsys() ) { @@ -3924,13 +3912,6 @@ info.numeric = true; info.nr = p.second; } - else if( dev.find("/dev/evms/")==0 ) - { - info.type = EVMS; - info.numeric = false; - info.vname = dev.substr( dev.find_last_of('/')+1 ); - info.cname = dev.substr( 0, dev.find_last_of('/') ); - } else if( dev.find("/dev/disk/by-uuid/")==0 || dev.find("/dev/disk/by-label/")==0 || dev.find("UUID=")==0 || dev.find("LABEL=")==0 ) @@ -4762,24 +4743,6 @@ return( ret ); } -Storage::EvmsCoIterator Storage::findEvmsCo( const string& name ) - { - assertInit(); - EvmsCoPair p = evCoPair(); - EvmsCoIterator ret=p.begin(); - string name1 = name; - string name2 = name; - if( !name.empty() && name.find( "lvm/" )!=0 && name.find( "lvm2/" )!=0 ) - { - name1 = "lvm/" + name1; - name2 = "lvm2/" + name2; - } - while( ret != p.end() && - (ret->deleted() || (ret->name()!=name1 && ret->name()!=name2)) ) - ++ret; - return( ret ); - } - Storage::DmraidCoIterator Storage::findDmraidCo( const string& name ) { assertInit(); @@ -5514,7 +5477,6 @@ MdCo::activate(val,tmpDir()); } LvmVg::activate(val); - EvmsCo::activate(val); if( !val ) { Dm::activate(val); Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h?rev=49710&r1=49709&r2=49710&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Tue Aug 5 15:12:53 2008 @@ -1651,7 +1651,6 @@ DiskIterator findDiskId( const string& id ); DiskIterator findDiskPath( const string& path ); LvmVgIterator findLvmVg( const string& name ); - EvmsCoIterator findEvmsCo( const string& name ); DmraidCoIterator findDmraidCo( const string& name ); DmPartCoIterator findDmPartCo( const string& name ); bool findVolume( const string& device, ContIterator& c, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org