[yast-commit] r65347 - in /branches/SuSE-Code-11-SP2-Branch/storage/storage/src: inst_disk_proposal.ycp inst_target_part.ycp modules/StorageProposal.ycp

Author: fehr Date: Mon Aug 15 16:54:43 2011 New Revision: 65347 URL: http://svn.opensuse.org/viewcvs/yast?rev=65347&view=rev Log: fix missing lvm crypt question in inst_target_part.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_part.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageProposal.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.ycp?rev=65347&r1=65346&r2=65347&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_disk_proposal.ycp Mon Aug 15 16:54:43 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: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_part.ycp?rev=65347&r1=65346&r2=65347&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_part.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_part.ycp Mon Aug 15 16:54:43 2011 @@ -210,6 +210,7 @@ // Event handling symbol ret = nil; + StorageProposal::SetCreateVg( true ); boolean ok = false; while(!ok) 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=65347&r1=65346&r2=65347&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:54:43 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() { @@ -4127,7 +4134,8 @@ Storage::CreateTargetBackup("query_prop_passwd"); Storage::RestoreTargetBackup("initial"); if (!isempty(StorageProposal::GetProposalPassword()) || - !Storage::NeedVgPassword( Storage::GetTargetMap(), "/dev/system")) + (!proposal_create_vg&& + !Storage::NeedVgPassword( Storage::GetTargetMap(), "/dev/system"))) no_query = true; Storage::RestoreTargetBackup("query_prop_passwd"); Storage::DisposeTargetBackup("query_prop_passwd"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org