Author: aschnell Date: Tue Aug 5 10:55:56 2008 New Revision: 49678 URL: http://svn.opensuse.org/viewcvs/yast?rev=49678&view=rev Log: - removed some evms code Modified: trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=49678&r1=49677&r2=49678&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Tue Aug 5 10:55:56 2008 @@ -52,7 +52,6 @@ global boolean no_fsid_menu = Arch::s390 (); global string raid_name = "MD Raid"; - global string evms_name = "EVMS"; global string lv_name = "LV"; global string dm_name = "DM"; global string loop_name = "Loop Device"; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=49678&r1=49677&r2=49678&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 10:55:56 2008 @@ -1634,58 +1634,6 @@ c["partitions"] = add( c["partitions"]:[], p ); }); } - else if( c["type"]:`CT_UNKNOWN == `CT_EVMS ) - { - list<any> pinfos = []; - any infos = LibStorage::EvmsCoInfo::new("LibStorage::EvmsCoInfo"); - string n = c["name"]:""; - c["is_container"] = size(c["name"]:"")>0; - if( c["is_container"]:false ) - { - ret = LibStorage::StorageInterface::getEvmsCoInfo( sint, n, infos ); - if( ret==0 ) - { - c["create"] = LibStorage::EvmsCoInfo::swig_create_get(infos); - c["size_k"] = LibStorage::EvmsCoInfo::swig_sizeK_get(infos); - c["cyl_size"] = 1024*LibStorage::EvmsCoInfo::swig_peSize_get(infos); - c["pesize"] = 1024*LibStorage::EvmsCoInfo::swig_peSize_get(infos); - c["cyl_count"] = LibStorage::EvmsCoInfo::swig_peCount_get(infos); - c["pe_free"] = LibStorage::EvmsCoInfo::swig_peFree_get(infos); - c["lvm2"] = LibStorage::EvmsCoInfo::swig_lvm2_get(infos); - list<string> ls = splitstring( LibStorage::EvmsCoInfo::swig_devices_get(infos), " " ); - c["devices"] = ls; - ls = splitstring( LibStorage::EvmsCoInfo::swig_devices_add_get(infos), " " ); - if( size(ls)>0 ) - c["devices_add"] = ls; - ls = splitstring( LibStorage::EvmsCoInfo::swig_devices_rem_get(infos), " " ); - if( size(ls)>0 ) - c["devices_rem"] = ls; - } - else - y2warning( "EVMS Co \"%1\" ret:%2", c["name"]:"", ret ); - } - ret = LibStorage::StorageInterface::getEvmsInfo( sint, n, pinfos ); - if( ret<0 ) - y2warning( "getEvmsInfo ret:%1", ret ); - y2milestone( "getContainerInfo n:%1 ret=%2", n, ret ); - foreach( any info, pinfos, - ``{ - map p = $[]; - vinfo = LibStorage::EvmsInfo::swig_v_get(info); - p = volumeMap( vinfo, p ); - p["stripes"] = LibStorage::EvmsInfo::swig_stripe_get(info); - t = LibStorage::EvmsInfo::swig_stripe_size_get(info); - if( t>0 ) - p["stripesize"] = t; - boolean tbool = LibStorage::EvmsInfo::swig_compatible_get(info); - if( !tbool ) - p["evms_native"] = true; - p["type"] = `evms; - p["fstype"] = Partitions::evms_name; - y2milestone( "partition %1", p ); - c["partitions"] = add( c["partitions"]:[], p ); - }); - } else if( c["type"]:`CT_UNKNOWN == `CT_MD ) { list<any> pinfos = []; Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=49678&r1=49677&r2=49678&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Tue Aug 5 10:55:56 2008 @@ -48,8 +48,6 @@ { case `UB_LVM: return "LVM " + used_by; - case `UB_EVMS: - return "EVMS " + used_by; case `UB_DM: return "DM " + used_by; case `UB_DMRAID: @@ -312,10 +310,6 @@ { value = "LVM" + (disk["lvm2"]:false ? "2 " : " ") + disk["name"]:""; } - else if(disk["type"]:`CT_UNKNOWN==`CT_EVMS) - { - value = "EVMS " + disk["name"]:""; - } else if(disk["type"]:`CT_UNKNOWN==`CT_DMRAID) { value = "BIOS RAID " + disk["name"]:""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org