Author: aschnell Date: Fri Dec 19 12:03:43 2008 New Revision: 54286 URL: http://svn.opensuse.org/viewcvs/yast?rev=54286&view=rev Log: - don't check swap partitions on disks used by BIOS RAID or DM Multipath (bnc #460081) Modified: branches/SuSE-Code-11-Branch/storage/VERSION branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/VERSION?rev=54286&r1=54285&r2=54286&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-Branch/storage/VERSION Fri Dec 19 12:03:43 2008 @@ -1 +1 @@ -2.17.64 +2.17.65 Modified: branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes?rev=54286&r1=54285&r2=54286&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes Fri Dec 19 12:03:43 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Dec 19 11:50:11 CET 2008 - aschnell@suse.de + +- don't check swap partitions on disks used by BIOS RAID or + DM Multipath (bnc #460081) +- 2.17.65 + +------------------------------------------------------------------- Thu Dec 18 11:13:48 CET 2008 - kmachalkova@suse.cz - Usability improvements (added F-key bindings, focusing convenient Modified: branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp?rev=54286&r1=54285&r2=54286&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ branches/SuSE-Code-11-Branch/storage/storage/src/include/do_proposal_flexible.ycp Fri Dec 19 12:03:43 2008 @@ -81,25 +81,27 @@ map swapable = $[]; -define void flex_init_swapable( map tg ) - ``{ +void flex_init_swapable( map tg ) +{ swapable = $[]; list swaps = Storage::SwappingPartitions(); - foreach( string dev, map disk, tg, - ``{ - list<map> sw = filter( map p, disk["partitions"]:[], - ``(p["type"]:`unknown!=`extended && - !p["delete"]:false && - p["detected_fs"]:`unknown==`swap)); - sw = filter( map p, sw, ``(contains( swaps, p["device"]:"" )|| - Storage::CheckSwapable(p["device"]:""))); - foreach( map p, sw, - ``{ - swapable[p["device"]:""] = true; + foreach(string dev, map disk, tg, { + if (disk["used_by_type"]:`UB_NONE != `UB_NONE) + { + list<map> sw = filter(map p, disk["partitions"]:[], + ``(p["type"]:`unknown!=`extended && + !p["delete"]:false && + p["detected_fs"]:`unknown==`swap)); + sw = filter(map p, sw, ``(contains(swaps, p["device"]:"") || + Storage::CheckSwapable(p["device"]:""))); + foreach(map p, sw, { + swapable[p["device"]:""] = true; }); - }); - y2milestone( "flex_init_swapable %1", swapable ); - } + } + }); + y2milestone("flex_init_swapable %1", swapable); +} + define boolean check_swapable( string dev ) { Modified: branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp?rev=54286&r1=54285&r2=54286&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp Fri Dec 19 12:03:43 2008 @@ -3314,7 +3314,6 @@ global define boolean CheckSwapable( string dev ) { string cmd = "swapon " + dev; - RemoveDmMapsTo( dev ); boolean ok = (integer)SCR::Execute(.target.bash, cmd )==0; if( ok ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org