[yast-commit] r66645 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/modules/Storage.ycp storage/src/modules/StorageProposal.ycp

Author: fehr Date: Mon Oct 31 18:46:27 2011 New Revision: 66645 URL: http://svn.opensuse.org/viewcvs/yast?rev=66645&view=rev Log: - version 2.21.12 - improve detection of /home partition (bnc#727362) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=66645&r1=66644&r2=66645&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Oct 31 18:46:27 2011 @@ -1 +1 @@ -2.21.11 +2.21.12 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=66645&r1=66644&r2=66645&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Oct 31 18:46:27 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 31 18:38:21 CET 2011 - fehr@suse.de + +- version 2.21.12 +- improve detection of /home partition (bnc#727362) + +------------------------------------------------------------------- Tue Oct 25 16:08:52 CEST 2011 - fehr@suse.de - version 2.21.11 Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=66645&r1=66644&r2=66645&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Oct 31 18:46:27 2011 @@ -4318,7 +4318,7 @@ } -boolean DetectHomeFs( map p ) +global boolean DetectHomeFs( map p ) { y2milestone( "DetectHomeFs p:%1", p ); boolean ret = false; Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageProposal.ycp?rev=66645&r1=66644&r2=66645&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Mon Oct 31 18:46:27 2011 @@ -411,6 +411,7 @@ map swapable = $[]; +map ishome = $[]; global void flex_init_swapable(map tg) @@ -2915,10 +2916,19 @@ Storage::CanDelete( p, disk, false ))); if( size(pl)>0 ) { + foreach( map p, pl, + ``{ + if( !haskey( ishome, p["device"]:"" )) + ishome[p["device"]:""] = Storage::DetectHomeFs(p); + }); pl = sort( map a, map b, pl, ``(a["size_k"]:0>b["size_k"]:0)); - pl = (list<map>) union( - filter( map p, pl, ``(!Storage::IsUsedBy(p)) ), + list<map> l1 = filter( map p, pl, ``(!Storage::IsUsedBy(p)) ); + l1 = (list<map>) union( + filter( map p, l1, ``(!ishome[p["device"]:""]:false) ), + filter( map p, l1, ``(ishome[p["device"]:""]:false) )); + + pl = (list<map>) union( l1, filter( map p, pl, ``(Storage::IsUsedBy(p)) )); partitions = -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org