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