Author: fehr Date: Thu Mar 25 18:26:38 2010 New Revision: 61499 URL: http://svn.opensuse.org/viewcvs/yast?rev=61499&view=rev Log: fix problems with detection of data on newly unlocked encrypted volumes (bnc #581341) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=61499&r1=61498&r2=61499&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Mar 25 18:26:38 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 25 18:24:35 CET 2010 - fehr@suse.de + +- fix problems with detection of data on newly unlocked encrypted + volumes (bnc #581341) + +------------------------------------------------------------------- Wed Mar 24 11:37:57 CET 2010 - fehr@suse.de - do not use default swap mounts in AutoYaST Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=61499&r1=61498&r2=61499&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Mar 25 18:26:38 2010 @@ -3190,10 +3190,14 @@ search( diskdev, "/dev/evms" )!=0 ) || (contains( swaps, part["device"]:"" ))) { + y2milestone( "AddSwapMp %1", part ); boolean ok = true; if( !contains( swaps, part["device"]:"" )) { - ok = CheckSwapable( part["device"]:"" ); + string dev = part["device"]:""; + if( !isempty(part["crypt_device"]:"")) + dev = part["crypt_device"]:""; + ok = CheckSwapable( dev ); y2milestone( "AddSwapMp initial ok:%1", ok ); } if( ok ) @@ -3434,10 +3438,10 @@ ``(p["enc_type"]:`none==`luks )); in_cr = (list<map>)merge( in_cr, filter( map p, tmp, - ``(size(p["crypt_device"]:"")==0))); + ``(isempty(p["crypt_device"]:"")))); ac_cr = (list<map>)merge( ac_cr, filter( map p, tmp, - ``(size(p["crypt_device"]:"")>0))); + ``(!isempty(p["crypt_device"]:"")))); }); y2milestone( "GetCryptLists inactive:%1", in_cr ); y2milestone( "GetCryptLists active:%1", ac_cr ); @@ -3452,6 +3456,7 @@ { map crvol = GetCryptLists( target ); boolean ret = true; + boolean rescan_done = false; // text in help field string helptext = _( "Enter encryption password for any of the @@ -3510,10 +3515,17 @@ crvol["inactive"] = filter( string s, crvol["inactive"]:[], ``(!contains(rl,s))); RescanCrypted(); + rescan_done = true; } } } } + if( rescan_done ) + { + StorageMap[targets_key] = target; + UpdateTargetMap(); + target = StorageMap[targets_key]:$[]; + } return( target ); } @@ -3691,7 +3703,7 @@ if (Stage::initial()) { tmp = AddProposalName(tmp); - AskCryptPasswords( tmp ); + tmp = AskCryptPasswords( tmp ); } StorageMap[targets_key] = tmp; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org