Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Fri Aug 26 09:27:31 CEST 2011.
-------- --- yast2-storage/yast2-storage.changes 2011-08-11 17:33:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2011-08-25 13:11:11.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Aug 22 16:01:19 CEST 2011 - [email protected] + +- forbid to use LVM for /boot (bnc#713176) +- version 2.21.5 + +------------------------------------------------------------------- +Wed Aug 17 11:46:14 CEST 2011 - [email protected] + +- fix popup about missing separate /home for lvm (bnc#712608) + +------------------------------------------------------------------- +Mon Aug 15 17:02:40 CEST 2011 - [email protected] + +- prevent reuse of existing vg when encryption state is wrong + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.21.4.tar.bz2 New: ---- yast2-storage-2.21.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.rBALyP/_old 2011-08-26 09:27:16.000000000 +0200 +++ /var/tmp/diff_new_pack.rBALyP/_new 2011-08-26 09:27:16.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-storage -Version: 2.21.4 +Version: 2.21.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.21.4.tar.bz2 +Source0: yast2-storage-2.21.5.tar.bz2 Prefix: /usr @@ -55,7 +55,7 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.21.4 +%setup -n yast2-storage-2.21.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-storage-2.21.4.tar.bz2 -> yast2-storage-2.21.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.4/VERSION new/yast2-storage-2.21.5/VERSION --- old/yast2-storage-2.21.4/VERSION 2011-08-11 11:32:05.000000000 +0200 +++ new/yast2-storage-2.21.5/VERSION 2011-08-25 13:06:02.000000000 +0200 @@ -1 +1 @@ -2.21.4 +2.21.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.4/storage/src/include/ep-lvm-lib.ycp new/yast2-storage-2.21.5/storage/src/include/ep-lvm-lib.ycp --- old/yast2-storage-2.21.4/storage/src/include/ep-lvm-lib.ycp 2011-02-22 17:32:47.000000000 +0100 +++ new/yast2-storage-2.21.5/storage/src/include/ep-lvm-lib.ycp 2011-08-22 16:02:05.000000000 +0200 @@ -190,6 +190,7 @@ map<string, map> target_map = Storage::GetTargetMap(); map<string, any> data = $[ "new" : true, + "type" : `lvm, "create" : true ]; string vg_name = substring(device, 5); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.4/storage/src/include/ep-raid-lib.ycp new/yast2-storage-2.21.5/storage/src/include/ep-raid-lib.ycp --- old/yast2-storage-2.21.4/storage/src/include/ep-raid-lib.ycp 2011-02-22 16:35:09.000000000 +0100 +++ new/yast2-storage-2.21.5/storage/src/include/ep-raid-lib.ycp 2011-08-22 16:02:05.000000000 +0200 @@ -52,6 +52,7 @@ } map<string, any> data = $[ "new" : true, + "type" : `sw_raid, "create" : true ]; map r = Storage::NextMd(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.4/storage/src/inst_disk_proposal.ycp new/yast2-storage-2.21.5/storage/src/inst_disk_proposal.ycp --- old/yast2-storage-2.21.4/storage/src/inst_disk_proposal.ycp 2011-02-17 15:44:33.000000000 +0100 +++ new/yast2-storage-2.21.5/storage/src/inst_disk_proposal.ycp 2011-08-15 17:02:24.000000000 +0200 @@ -257,6 +257,7 @@ // if( !Storage::GetTestsuite() ) { + StorageProposal::SetCreateVg( false ); map enab = (map)WFM::Args(0); Wizard::SetContents( title, contents, help_text, enab["enable_back"]:false, enab["enable_next"]:false ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.4/storage/src/inst_target_part.ycp new/yast2-storage-2.21.5/storage/src/inst_target_part.ycp --- old/yast2-storage-2.21.4/storage/src/inst_target_part.ycp 2011-08-10 16:48:27.000000000 +0200 +++ new/yast2-storage-2.21.5/storage/src/inst_target_part.ycp 2011-08-17 11:55:17.000000000 +0200 @@ -9,7 +9,7 @@ * -Ask the user which partition to use. * -Check the input and return error-messages. * - * $Id: inst_target_part.ycp 65304 2011-08-10 14:48:26Z fehr $ + * $Id: inst_target_part.ycp 65361 2011-08-17 09:55:15Z fehr $ */ { textdomain "storage"; @@ -210,6 +210,7 @@ // Event handling symbol ret = nil; + StorageProposal::SetCreateVg( true ); boolean ok = false; while(!ok) @@ -409,7 +410,10 @@ remove or select a larger disk."); display_error_box (reason); } - list<map> pl = Storage::GetTargetMap()[target_is,"partitions"]:[]; + map tg = Storage::GetTargetMap(); + list<map> pl = tg[target_is,"partitions"]:[]; + if( haskey( tg, "/dev/system" )) + pl = (list<map>)union( pl, tg["/dev/system","partitions"]:[] ); y2milestone( "proposed partitions:%1", pl ); if( StorageProposal::GetProposalHome() && size(filter( map p, pl, ``(p["mount"]:""=="/home")))==0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.4/storage/src/modules/Storage.ycp new/yast2-storage-2.21.5/storage/src/modules/Storage.ycp --- old/yast2-storage-2.21.4/storage/src/modules/Storage.ycp 2011-08-09 16:32:00.000000000 +0200 +++ new/yast2-storage-2.21.5/storage/src/modules/Storage.ycp 2011-08-15 17:03:00.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 65294 2011-08-09 14:31:59Z fehr $ + * $Id: Storage.ycp 65350 2011-08-15 15:02:59Z fehr $ */ { module "Storage"; @@ -3110,6 +3110,39 @@ return( ret ); } +global boolean IsVgEncrypted( map<string,map> tg, string vg_key ) + { + boolean ret = false; + list<string> devs = tg[vg_key,"devices"]:[]; + foreach( string s, devs, + ``{ + map p = GetPartition( tg, s ); + if( !ret ) + ret = p["enc_type"]:`none==`luks; + y2milestone( "IsVgEncrypted ret:%1 p:%2", ret, p ); + }); + y2milestone( "IsVgEncrypted key:%1 ret:%2", vg_key, ret ); + return( ret ); + } + +global boolean NeedVgPassword( map<string,map> tg, string vg_key ) + { + boolean ret = IsVgEncrypted( tg, vg_key ); + y2milestone( "NeedVgPassword vg:%1", tg[vg_key]:$[] ); + if( ret ) + { + list<string> devs = tg[vg_key,"devices"]:[]; + foreach( string s, devs, + ``{ + ret = ret && NeedCryptPwd( s ); + y2milestone( "NeedVgPassword ret:%1 s:%2", ret, s ); + }); + } + else + ret = !haskey( tg, vg_key ); + y2milestone( "NeedVgPassword key:%1 ret:%2", vg_key, ret ); + return( ret ); + } global string CreateLoop( string file, boolean create, integer sizeK, string mp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.21.4/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.21.5/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.21.4/storage/src/modules/StorageProposal.ycp 2011-07-28 12:39:19.000000000 +0200 +++ new/yast2-storage-2.21.5/storage/src/modules/StorageProposal.ycp 2011-08-15 17:02:25.000000000 +0200 @@ -52,9 +52,16 @@ boolean proposal_encrypt = false; boolean proposal_btrfs = false; string proposal_password = ""; + boolean proposal_create_vg = false; map<string, any> cfg_xml = $[]; + global void SetCreateVg( boolean val ) + { + proposal_create_vg = val; + y2milestone( "SetCreateVg val:%1", proposal_create_vg ); + } + global boolean GetProposalHome() { @@ -3436,6 +3443,9 @@ if( GetProposalLvm() && target[key,"lvm2"]:false && target[key,"size_k"]:0 >= min_size ) ret = key; + if( size(ret)>0 && + GetProposalEncrypt()!=Storage::IsVgEncrypted(target, key)) + ret = ""; y2milestone( "find_vm key:%1 min_size:%2 ret:%3", ky, min_size, ret ); return( ret ); } @@ -4120,7 +4130,16 @@ boolean QueryProposalPassword() { - if (!isempty(StorageProposal::GetProposalPassword())) + boolean no_query = false; + Storage::CreateTargetBackup("query_prop_passwd"); + Storage::RestoreTargetBackup("initial"); + if (!isempty(StorageProposal::GetProposalPassword()) || + (!proposal_create_vg&& + !Storage::NeedVgPassword( Storage::GetTargetMap(), "/dev/system"))) + no_query = true; + Storage::RestoreTargetBackup("query_prop_passwd"); + Storage::DisposeTargetBackup("query_prop_passwd"); + if( no_query ) return true; UI::OpenDialog(`VBox( ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
