Author: fehr
Date: Wed Aug 10 15:38:54 2011
New Revision: 65298
URL: http://svn.opensuse.org/viewcvs/yast?rev=65298&view=rev
Log:
do not allow to partition disks used by LVM in disk selection
Modified:
branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes
branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_selection.ycp
branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageFields.ycp
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=65298&r1=65297&r2=65298&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 Wed Aug 10 15:38:54 2011
@@ -2,6 +2,7 @@
Wed Aug 10 14:59:41 CEST 2011 - fehr@suse.de
- allow label on btrfs when format is true
+- do not allow to partition disks used by LVM in disk selection
-------------------------------------------------------------------
Tue Aug 9 16:29:08 CEST 2011 - fehr@suse.de
Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_selection.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_selection.ycp?rev=65298&r1=65297&r2=65298&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_selection.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/inst_target_selection.ycp Wed Aug 10 15:38:54 2011
@@ -24,6 +24,7 @@
import "Partitions";
import "Wizard";
import "Storage";
+ import "StorageFields";
include "partitioning/custom_part_helptexts.ycp";
@@ -230,6 +231,12 @@
Popup::Error( Partitions::RdonlyText( (string)option, true ));
sym = `again;
}
+ else if( Storage::IsUsedBy(targetMap[(string)option]:$[]))
+ {
+ string s = StorageFields::UsedByString(targetMap[(string)option,"used_by",0]:$[] );
+ Popup::Error( sformat(_("Disk %1 is in use by %2"), (string)option, s ));
+ sym = `again;
+ }
else
{
Storage::SetPartMode( "USE_DISK" );
Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageFields.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageFields.ycp?rev=65298&r1=65297&r2=65298&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageFields.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/StorageFields.ycp Wed Aug 10 15:38:54 2011
@@ -57,7 +57,7 @@
}
- string UsedByString(map