Author: fehr Date: Wed Jan 26 16:05:49 2011 New Revision: 63275 URL: http://svn.opensuse.org/viewcvs/yast?rev=63275&view=rev Log: add button to trigger query for crypt password (bnc #666883) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-all.ycp 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.cha... ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jan 26 16:05:49 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 26 16:03:35 CET 2011 - fehr@suse.de + +- add button to trigger query for crypt password (bnc #666883) + +------------------------------------------------------------------- Tue Jan 18 14:49:17 CET 2011 - jsrain@suse.cz - adaptations for unattended migration Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-al... ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Wed Jan 26 16:05:49 2011 @@ -60,6 +60,8 @@ if (true) { // menu entry text configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); + // menu entry text + configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); } if (Arch::s390() && IsAvailable("s390")) { @@ -192,6 +194,15 @@ Really call Multipath configuration?"), nil, "multipath-simple"); break; + case `cryptpwd: + map<string,map> tg = Storage::GetTargetMap(); + tg = Storage::AskCryptPasswords( tg ); + Storage::SetTargetMap(tg); + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + break; + case `dasd: // popup text CallConfig(_("Calling DASD configuration cancels all current changes. Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stora... ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jan 26 16:05:49 2011 @@ -3451,7 +3451,7 @@ return( ret ); } -map<string, map> AskCryptPasswords( map<string, map> target ) +global map<string, map> AskCryptPasswords( map<string, map> target ) { map crvol = GetCryptLists( target ); boolean ret = true; @@ -3464,6 +3464,8 @@ // header text string header = _("Enter Encryption Password"); + if( Mode::normal() && size(crvol["inactive"]:[])==0 ) + Popup::Error( _("There are no encrypted volume to unlock.")); while( size(crvol["inactive"]:[])>0 && ret ) { ret = CryptVolPopup( crvol["inactive"]:[], crvol["active"]:[] ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org