Author: fehr Date: Mon Aug 15 17:02:59 2011 New Revision: 65350 URL: http://svn.opensuse.org/viewcvs/yast?rev=65350&view=rev Log: prevent reuse of existing vg when encryption state is wrong Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/inst_disk_proposal.ycp trunk/storage/storage/src/inst_target_part.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=65350&r1=65349&r2=65350&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 15 17:02:59 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 15 17:02:40 CEST 2011 - fehr@suse.de + +- prevent reuse of existing vg when encryption state is wrong + +------------------------------------------------------------------- Wed Aug 10 16:36:17 CEST 2011 - fehr@suse.de - allow label on btrfs when format is true Modified: trunk/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_proposal.ycp?rev=65350&r1=65349&r2=65350&view=diff ============================================================================== --- trunk/storage/storage/src/inst_disk_proposal.ycp (original) +++ trunk/storage/storage/src/inst_disk_proposal.ycp Mon Aug 15 17:02:59 2011 @@ -257,6 +257,7 @@ // if( !Storage::GetTestsuite() ) { + StorageProposal::SetCreateVg( false ); map enab = (map)WFM::Args(0); Wizard::SetContents( title, contents, help_text, enab["enable_back"]:false, enab["enable_next"]:false ); Modified: trunk/storage/storage/src/inst_target_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_part.ycp?rev=65350&r1=65349&r2=65350&view=diff ============================================================================== --- trunk/storage/storage/src/inst_target_part.ycp (original) +++ trunk/storage/storage/src/inst_target_part.ycp Mon Aug 15 17:02:59 2011 @@ -210,6 +210,7 @@ // Event handling symbol ret = nil; + StorageProposal::SetCreateVg( true ); boolean ok = false; while(!ok) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=65350&r1=65349&r2=65350&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Aug 15 17:02:59 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: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageProposal.ycp?rev=65350&r1=65349&r2=65350&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Mon Aug 15 17:02:59 2011 @@ -52,9 +52,16 @@ boolean proposal_encrypt = false; boolean proposal_btrfs = false; string proposal_password = ""; + boolean proposal_create_vg = false; map cfg_xml = $[]; + global void SetCreateVg( boolean val ) + { + proposal_create_vg = val; + y2milestone( "SetCreateVg val:%1", proposal_create_vg ); + } + global boolean GetProposalHome() { @@ -3436,6 +3443,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 +4130,16 @@ boolean QueryProposalPassword() { - if (!isempty(StorageProposal::GetProposalPassword())) + boolean no_query = false; + Storage::CreateTargetBackup("query_prop_passwd"); + Storage::RestoreTargetBackup("initial"); + if (!isempty(StorageProposal::GetProposalPassword()) || + (!proposal_create_vg&& + !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