Author: fehr Date: Mon Aug 15 16:20:45 2011 New Revision: 65344 URL: http://svn.opensuse.org/viewcvs/yast?rev=65344&view=rev Log: - prevent reuse of existing vg when encryption state is wrong - version 2.17.110 Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/VERSION?rev=65344&r1=65343&r2=65344&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Mon Aug 15 16:20:45 2011 @@ -1 +1 @@ -2.17.109 +2.17.110 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=65344&r1=65343&r2=65344&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 Mon Aug 15 16:20:45 2011 @@ -90,11 +90,20 @@ Volume const* cv = NULL; unsigned long long sum_size = 0; list<string> an; + bool forbidden = false; for( list<string>::const_iterator d=e.devices.begin(); d!=e.devices.end(); ++d ) { Volume const* v; if( getStorage()->findVolume( *d, v )) { + list<UsedBy> ub = v->getUsedBy(); + for( list<UsedBy>::const_iterator i=ub.begin(); + i!=ub.end(); ++i ) + { + forbidden = i->type()!=UB_BTRFS; + } + if( !ub.empty() ) + y2mil( "used_by:" << ub ); if( cv==NULL || (cv->getMount().empty() && !v->getMount().empty()) || (!cv->getFormat() && v->getFormat() )) @@ -107,15 +116,22 @@ y2war( "device " << *d << " not found" ); } list<string> devs; - for( list<string>::const_iterator i=e.devices.begin(); i!=e.devices.end(); ++i ) + if( forbidden ) + cv = NULL; + else { - const Device* v; - if( getStorage()->findDevice( *i, v ) ) - devs.push_back( v->device() ); - else - devs.push_back( *i ); + for( list<string>::const_iterator i=e.devices.begin(); + i!=e.devices.end(); ++i ) + { + const Device* v; + if( getStorage()->findDevice( *i, v ) ) + devs.push_back( v->device() ); + else + devs.push_back( *i ); + } } - y2mil( "cv:" << cv << " sum:" << sum_size << " devs:" << devs ); + y2mil( "forbidden:" << forbidden << " cv:" << cv << + " sum:" << sum_size << " devs:" << devs ); if( cv!=NULL ) { Btrfs* b = new Btrfs( *this, *cv, sum_size, devs ); 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=65344&r1=65343&r2=65344&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 Mon Aug 15 16:20:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 15 16:19:54 CEST 2011 - fehr@suse.de + +- prevent reuse of existing vg when encryption state is wrong +- version 2.17.110 + +------------------------------------------------------------------- Wed Aug 10 16:36:17 CEST 2011 - fehr@suse.de - allow label on btrfs when format is true 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=65344&r1=65343&r2=65344&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 Mon Aug 15 16:20:45 2011 @@ -3110,6 +3110,39 @@ return( ret ); } +global boolean IsVgEncrypted( map tg, string vg_key ) + { + boolean ret = false; + list<string> devs = tg[vg_key,"devices"]:[]; + foreach( string s, devs, + ``{ + map p = GetPartition( tg, s ); + if( !ret ) + ret = p["enc_type"]:`none==`luks; + y2milestone( "IsVgEncrypted ret:%1 p:%2", ret, p ); + }); + y2milestone( "IsVgEncrypted key:%1 ret:%2", vg_key, ret ); + return( ret ); + } + +global boolean NeedVgPassword( map tg, string vg_key ) + { + boolean ret = IsVgEncrypted( tg, vg_key ); + y2milestone( "NeedVgPassword vg:%1", tg[vg_key]:$[] ); + if( ret ) + { + list<string> devs = tg[vg_key,"devices"]:[]; + foreach( string s, devs, + ``{ + ret = ret && NeedCryptPwd( s ); + y2milestone( "NeedVgPassword ret:%1 s:%2", ret, s ); + }); + } + else + ret = !haskey( tg, vg_key ); + y2milestone( "NeedVgPassword key:%1 ret:%2", vg_key, ret ); + return( ret ); + } global string CreateLoop( string file, boolean create, integer sizeK, string mp ) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp?rev=65344&r1=65343&r2=65344&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp Mon Aug 15 16:20:45 2011 @@ -3436,6 +3436,9 @@ if( GetProposalLvm() && target[key,"lvm2"]:false && target[key,"size_k"]:0 >= min_size ) ret = key; + if( size(ret)>0 && + GetProposalEncrypt()!=Storage::IsVgEncrypted(target, key)) + ret = ""; y2milestone( "find_vm key:%1 min_size:%2 ret:%3", ky, min_size, ret ); return( ret ); } @@ -4120,7 +4123,15 @@ boolean QueryProposalPassword() { - if (!isempty(StorageProposal::GetProposalPassword())) + boolean no_query = false; + Storage::CreateTargetBackup("query_prop_passwd"); + Storage::RestoreTargetBackup("initial"); + if (!isempty(StorageProposal::GetProposalPassword()) || + !Storage::NeedVgPassword( Storage::GetTargetMap(), "/dev/system")) + no_query = true; + Storage::RestoreTargetBackup("query_prop_passwd"); + Storage::DisposeTargetBackup("query_prop_passwd"); + if( no_query ) return true; UI::OpenDialog(`VBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org