Author: aschnell Date: Fri Nov 6 11:31:29 2009 New Revision: 59368 URL: http://svn.opensuse.org/viewcvs/yast?rev=59368&view=rev Log: - cleanup Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage... ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc Fri Nov 6 11:31:29 2009 @@ -2016,10 +2016,5 @@ void MdPartCo::logData( const string& Dir ) {} -<<<<<<< .mine -======= -void MdPartCo::logData( const string& Dir ) {} - ->>>>>>> .r59349 } Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorage... ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/Storage.cc Fri Nov 6 11:31:29 2009 @@ -224,9 +224,9 @@ delete ppart; ppart = new ProcPart; } + detectMdParts(*ppart); detectMds(); - detectDmraid( *ppart ); detectDmmultipath( *ppart ); detectLvmVgs(); @@ -460,7 +460,6 @@ void Storage::detectMds() { - y2mil("Called"); if( testmode() ) { string file = testdir()+"/md"; @@ -471,14 +470,12 @@ } else { - y2mil("Calling MdCo"); MdCo * v = new MdCo( this, true ); if( !v->isEmpty() ) addToList( v ); else delete v; } - y2mil("Done"); } bool Storage::discoverMdPVols() @@ -1559,9 +1556,7 @@ if( vol->getUsedByType() != UB_NONE ) ret = removeUsing( vol->device(), vol->getUsedBy() ); if( ret==0 ) - { ret = disk->removePartition( vol->nr() ); - } } else ret = STORAGE_REMOVE_USED_VOLUME; @@ -1748,7 +1743,6 @@ { ret = STORAGE_RESIZE_INVALID_CONTAINER; } - } else { @@ -1813,7 +1807,6 @@ { ret = STORAGE_CHANGE_PARTITION_ID_INVALID_CONTAINER; } - } else { @@ -3605,6 +3598,7 @@ return( ret ); } + int Storage::getMdStateInfo(const string& name, MdStateInfo& info) { int ret = 0; @@ -3700,6 +3694,7 @@ return ret; } + bool Storage::haveMd( MdCo*& md ) { md = NULL; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org