Author: aschnell
Date: Tue Feb 17 12:59:02 2009
New Revision: 55542
URL: http://svn.opensuse.org/viewcvs/yast?rev=55542&view=rev
Log:
- removed some evms code
Modified:
trunk/storage/storage/src/include/custom_part_dialogs.ycp
trunk/storage/storage/src/include/do_proposal_flexible.ycp
trunk/storage/storage/src/modules/Storage.ycp
Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=55542&r1=55541&r2=55542&view=diff
==============================================================================
--- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original)
+++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Tue Feb 17 12:59:02 2009
@@ -987,7 +987,6 @@
if( new_val["type"]:`primary != `lvm &&
new_val["type"]:`primary != `sw_raid &&
- new_val["type"]:`primary != `evms &&
new_val["type"]:`primary != `loop && !Partitions::no_fsid_menu )
{
fsid = `VBox(
Modified: trunk/storage/storage/src/include/do_proposal_flexible.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/do_proposal_flexible.ycp?rev=55542&r1=55541&r2=55542&view=diff
==============================================================================
--- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original)
+++ trunk/storage/storage/src/include/do_proposal_flexible.ycp Tue Feb 17 12:59:02 2009
@@ -65,10 +65,9 @@
ret = true;
}
if( !ret && soft )
+ {
ret = entry["used_by_type"]:`UB_NONE != `UB_NONE;
- if( !ret && (Storage::ProposalEvms()&&!Storage::BootEvms()) &&
- entry["label"]:""!="msdos" )
- ret = true;
+ }
if( ret )
{
y2milestone( "ignoring disk %1 soft:%2", dev, soft );
@@ -3047,45 +3046,6 @@
tg = Storage::DelPartitionData( tg, d, "used_by_type" );
});
}
- if( haskey( tg, "/dev/evms/lvm/"+ky ) || haskey( tg, "/dev/evms/lvm2/"+ky ))
- {
- if( haskey( tg, "/dev/evms/lvm/"+ky ) && tg[key,"lvm2"]:false )
- {
- key = "/dev/evms/lvm/"+ky;
- tg[key,"delete"] = true;
- tg[key,"partitions"] =
- maplist( map p, tg[key,"partitions"]:[],
- ``{
- p["delete"] = true;
- return(p);
- });
- y2milestone( "remove_vm removed:%1", tg[key]:$[] );
- list<string> dl = tg[key,"devices"]:[];
- foreach( string d, dl,
- ``{
- tg = Storage::DelPartitionData( tg, d, "used_by" );
- tg = Storage::DelPartitionData( tg, d, "used_by_type" );
- });
- }
- if( haskey( tg, "/dev/evms/lvm2/"+ky ) && !tg[key,"lvm2"]:false )
- {
- key = "/dev/evms/lvm2/"+ky;
- tg[key,"delete"] = true;
- tg[key,"partitions"] =
- maplist( map p, tg[key,"partitions"]:[],
- ``{
- p["delete"] = true;
- return(p);
- });
- y2milestone( "remove_vm removed:%1", tg[key]:$[] );
- list<string> dl = tg[key,"devices"]:[];
- foreach( string d, dl,
- ``{
- tg = Storage::DelPartitionData( tg, d, "used_by" );
- tg = Storage::DelPartitionData( tg, d, "used_by_type" );
- });
- }
- }
return( tg );
}
@@ -3093,13 +3053,9 @@
{
string ret = "";
string key = "/dev/" + ky;
- string key2 = "/dev/evms/lvm2/" + ky;
if( Storage::ProposalLvm() && target[key,"lvm2"]:false &&
target[key,"size_k"]:0 >= min_size )
ret = key;
- else if( Storage::ProposalEvms() && haskey( target, key2 ) &&
- target[key2,"size_k"]:0 >= min_size )
- ret = key2;
y2milestone( "find_vm key:%1 min_size:%2 ret:%3", ky, min_size, ret );
return( ret );
}
@@ -3155,12 +3111,12 @@
return( vg );
}
-map create_vm( boolean evms, string key, map disk )
+map create_vm( string key, map disk )
{
- y2milestone( "create_vm evms %1 key %2 disk %3", evms, key, disk );
- map ret = $[ "type" : evms?`CT_EVMS:`CT_LVM,
- "name" : evms?"lvm2/"+key:key,
- "device" : "/dev/"+(evms?"evms/lvm2/":"")+key,
+ y2milestone("create_vm key:%1 disk:%2", key, disk);
+ map ret = $[ "type" : `CT_LVM,
+ "name" : key,
+ "device" : "/dev/" + key,
"lvm2" : true,
"create" : true,
"partitions" : [],
@@ -3645,10 +3601,9 @@
ret["target"] = remove_used_by( ret["target"]:$[], sol_disk );
if( size(vg_key)==0 )
{
- vg_key = (Storage::ProposalEvms()?"/dev/evms/lvm2/":"/dev/")+key;
+ vg_key = "/dev/" + key;
map vg = ret["target",vg_key]:$[];
- vg = union( vg, create_vm( Storage::ProposalEvms(), key,
- solution[sol_disk]:$[] ));
+ vg = union( vg, create_vm( key, solution[sol_disk]:$[] ));
if( size(vg["devices"]:[])>0 )
{
vg = remove( vg, "devices" );
@@ -3675,9 +3630,8 @@
map get_proposal_vm( map