Author: aschnell Date: Mon Jun 8 15:57:35 2009 New Revision: 57501 URL: http://svn.opensuse.org/viewcvs/yast?rev=57501&view=rev Log: - check enc_type for possible devices for lvm and raid Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/include/raid_lib.ycp Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_pv_lib.ycp?rev=57501&r1=57500&r2=57501&view=diff ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Mon Jun 8 15:57:35 2009 @@ -87,6 +87,7 @@ list fsids = [ Partitions::fsid_lvm, Partitions::fsid_raid, Partitions::fsid_native ]; list ubs = [ `UB_NONE, `UB_LVM ]; + list allowed_enc_types = [ `none, `luks ]; foreach( string dev, map devmap, targetMap, ``{ @@ -95,6 +96,7 @@ filter( map part, devmap["partitions"]:[], ``( size(part["mount"]:"")==0 && !contains( types_no, part["type"]:`primary ) && + contains(allowed_enc_types, part["enc_type"]:`none) && contains( ubs, part["used_by_type"]:`UB_NONE ) && (part["type"]:`primary==`sw_raid|| part["type"]:`primary==`dm|| Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid_lib.ycp?rev=57501&r1=57500&r2=57501&view=diff ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Mon Jun 8 15:57:35 2009 @@ -56,11 +56,14 @@ list fsids = [ Partitions::fsid_lvm, Partitions::fsid_raid, Partitions::fsid_native ]; list ubs = [ `UB_NONE, `UB_MD ]; + list allowed_enc_types = [ `none ]; + foreach( string dev, map devmap, targetMap, ``{ ret = filter( map p, devmap["partitions"]:[], ``( size(p["mount"]:"")==0 && !contains( types_no, p["type"]:`primary ) && + contains(allowed_enc_types, p["enc_type"]:`none) && contains( ubs, p["used_by_type"]:`UB_NONE ) && (!haskey(p,"fsid")||contains( fsids, p["fsid"]:0 )))); allret = (list<map>)merge(allret, ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org