Author: aschnell Date: Wed Aug 19 17:00:07 2009 New Revision: 58390 URL: http://svn.opensuse.org/viewcvs/yast?rev=58390&view=rev Log: - some refactoring - some cleanup Modified: trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=58390&r1=58389&r2=58390&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Aug 19 17:00:07 2009 @@ -770,7 +770,7 @@ * Get List of swap partitions * @return list List of swap partitions */ -global list SwappingPartitions() +global list<string> SwappingPartitions() { SCR::UnmountAgent(.proc.swaps); list<map> swaps = (list<map>) SCR::Read(.proc.swaps); @@ -779,48 +779,12 @@ swaps = []; } swaps = filter(map e, swaps, ``(e["type"]:""=="partition")); - list ret = maplist(map e, swaps, ``(Partitions::TranslateMapperName(e["file"]:""))); + list<string> ret = maplist(map e, swaps, ``(Partitions::TranslateMapperName(e["file"]:""))); y2milestone("SwappingPartitions %1", ret); return ret; } -list<string> GetDestroyedLvmVgs(map target) -{ - list<string> vgs = []; - foreach(string diskdev, map disk, target, { - foreach( map p, disk["partitions"]:[], { - if( p["used_by_type"]:`UB_NONE==`UB_LVM && p["format"]:false ) - { - vgs = add(vgs, p["used_by_device"]:""); - } - }); - }); - vgs = toset(vgs); - y2milestone( "GetDestroyedLvmVgs %1", vgs ); - return vgs; -} - - -global map DeleteDestroyedLvmVgs(map target) -{ - list<string> vgs = GetDestroyedLvmVgs(target); - y2milestone( "DeleteDestroyedLvmVgs %1", vgs ); - foreach(string dev, vgs, { - if( haskey( target, dev )) - target[dev,"delete"] = true; - target[dev,"partitions"] = maplist( map p, target[dev,"partitions"]:[], - ``{ - if( haskey( p, "mount" )) - p = remove( p, "mount" ); - return( p ); - }); - y2milestone( "DeleteDestroyedLvmVgs %1: %2", dev, target[dev]:$[] ); - }); - return target; -} - - /** * Returns map of free space per partition * @@ -994,12 +958,14 @@ return( targets ); }; -global define string SaveDumpPath( string name )``{ - string ret = Directory::tmpdir + "/" + name; - y2debug( "name=%1 path=%2", name, ret ); - return ret; + + global string SaveDumpPath(string name) + { + string ret = Directory::tmpdir + "/" + name; + return ret; } + // add mount point for all mounted partitions /** * Adds mountpoint info to the target map and returns the changed map @@ -1765,7 +1731,7 @@ * @param map disk * @return map disk info */ -global define map getDiskInfo( string device, map disk ) + map getDiskInfo(string device, map disk) { map c = $[]; c = find( map p, conts, ``(p["device"]:""==device )); @@ -1960,11 +1926,9 @@ } -// Constructor -global define void Storage() - ``{ - map m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" ); - y2milestone( "constructor Storage() time:%1", m["stdout"]:"" ); + // Storage Constructor + global void Storage() + { if( Mode::normal() ) { Storage::SetPartMode( "CUSTOM" ); @@ -1982,8 +1946,6 @@ Storage::SetPartMode( "CUSTOM" ); Storage::SetPartProposalActive( false ); } - m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" ); - y2milestone( "constructor Storage() end time:%1", m["stdout"]:"" ); } @@ -4830,15 +4792,16 @@ } } + global void FinishInstall() { y2milestone("FinishInstall initial:%1", Stage::initial()); - map tg = GetTargetMap(); + map target_map = GetTargetMap(); if( Stage::initial() ) { - HandleModulesOnBoot( tg ); + HandleModulesOnBoot(target_map); } boolean need_crypt = false; @@ -4847,11 +4810,10 @@ boolean need_dmraid = false; boolean need_dmmultipath = false; - foreach( string k, map e, tg, { - if( size(filter( map p, e["partitions"]:[], - ``(p["enc_type"]:`none != `none)))>0 ) + foreach (string k, map e, target_map, { + if (find(map part, e["partitions"]:[], { return part["enc_type"]:`none != `none; }) != nil) need_crypt = true; - if( e["type"]:`CT_UNKNOWN==`CT_MD && size(e["partitions"]:[])>0 ) + if (e["type"]:`CT_UNKNOWN == `CT_MD && !isempty(e["partitions"]:[])) need_md = true; if( e["type"]:`CT_UNKNOWN==`CT_LVM ) need_lvm = true; @@ -4875,22 +4837,20 @@ y2milestone("FinishInstall done"); } -global define map GetEntryForMountpoint( string mp ) - ``{ - list<map> all_partitions = []; - foreach( string dev, map disk, GetTargetMap(), - ``{ - all_partitions = (list<map>)union( all_partitions, - disk["partitions"]:[] ); + + global map GetEntryForMountpoint(string mp) + { + list<map> partitions = []; + + foreach(string dev, map disk, GetTargetMap(), { + list<map> tmp = filter(map part, disk["partitions"]:[], { return part["mount"]:"" == mp; }); + partitions = (list<map>) union(partitions, tmp); }); - map partition = find( map part, all_partitions, ``(part["mount"]:""==mp) ); - if( partition==nil || partition["mount"]:"" != mp ) - { - partition = $[]; - } - return partition; + + return partitions[0]:$[]; } + global define list GetRootInitrdModules() ``{ map partition = GetEntryForMountpoint( "/" ); @@ -4970,36 +4930,24 @@ return initrdmodules; }; -/** - * CheckForLvmRootFs - *--------------------------------------------------------------------- - * check if the root filesystem is a lvm logical volume - * - **/ -global define boolean CheckForLvmRootFs() - ``{ - map part = GetEntryForMountpoint( "/" ); - y2milestone( "CheckForLvmRootFs root=%1", part ); - boolean ret = part["type"]:`primary==`lvm; - y2milestone( "CheckForLvmRootFs ret=%1", ret ); - return ret; - }; + global boolean CheckForLvmRootFs() + { + map part = GetEntryForMountpoint("/"); + boolean ret = part["type"]:`primary == `lvm; + y2milestone("CheckForLvmRootFs root:%1 ret:%2", part, ret); + return ret; + } + + + global boolean CheckForMdRootFs() + { + map part = GetEntryForMountpoint("/"); + boolean ret = part["type"]:`primary == `sw_raid; + y2milestone("CheckForMdRootFs root:%1 ret:%2", part, ret); + return ret; + } - /*--------------------------------------------------------------------- - * checkForMdRootFs - *--------------------------------------------------------------------- - * check if the root filesystem is a md device - *--------------------------------------------------------------------- - */ -global define boolean CheckForMdRootFs() - ``{ - map part = GetEntryForMountpoint( "/" ); - boolean ret = part["type"]:`primary==`sw_raid; - y2milestone( "CheckForMdRootFs root=%1", part ); - y2milestone( "CheckForMdRootFs ret=%1", ret ); - return ret; - }; global define void AdaptResize( string maindev, list region, integer schange ) ``{ Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageProposal.ycp?rev=58390&r1=58389&r2=58390&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Wed Aug 19 17:00:07 2009 @@ -205,6 +205,42 @@ } + list<string> GetDestroyedLvmVgs(map target) + { + list<string> vgs = []; + foreach(string diskdev, map disk, target, { + foreach( map p, disk["partitions"]:[], { + if( p["used_by_type"]:`UB_NONE==`UB_LVM && p["format"]:false ) + { + vgs = add(vgs, p["used_by_device"]:""); + } + }); + }); + vgs = toset(vgs); + y2milestone( "GetDestroyedLvmVgs %1", vgs ); + return vgs; + } + + + map DeleteDestroyedLvmVgs(map target) + { + list<string> vgs = GetDestroyedLvmVgs(target); + y2milestone( "DeleteDestroyedLvmVgs %1", vgs ); + foreach(string dev, vgs, { + if( haskey( target, dev )) + target[dev,"delete"] = true; + target[dev,"partitions"] = maplist( map p, target[dev,"partitions"]:[], + ``{ + if( haskey( p, "mount" )) + p = remove( p, "mount" ); + return( p ); + }); + y2milestone( "DeleteDestroyedLvmVgs %1: %2", dev, target[dev]:$[] ); + }); + return target; + } + + list<string> NoProposeDisks() { if (no_propose_disks == nil) @@ -848,7 +884,7 @@ }); ret["ok"] = true; target = Storage::SpecialBootHandling( target ); - ret["target"] = Storage::DeleteDestroyedLvmVgs( target ); + ret["target"] = DeleteDestroyedLvmVgs(target); } } return( ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org