Author: aschnell Date: Mon Nov 16 14:13:35 2009 New Revision: 59566 URL: http://svn.opensuse.org/viewcvs/yast?rev=59566&view=rev Log: - enabled storage proposal for S390 (bnc #462254) Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp branches/SuSE-Code-11-SP1-Branch/storage/storage/src/inst_disk_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes?rev=59566&r1=59565&r2=59566&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Nov 16 14:13:35 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 16 14:11:34 CET 2009 - aschnell@suse.de + +- enabled storage proposal for S390 (bnc #462254) + +------------------------------------------------------------------- Fri Nov 13 16:19:18 CET 2009 - aschnell@suse.de - check that Storage::Update is only run once (bnc #477778) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp?rev=59566&r1=59565&r2=59566&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp Mon Nov 16 14:13:35 2009 @@ -48,8 +48,7 @@ define boolean ignore_disk( string dev, map entry, boolean soft ) ``{ - boolean ret = !Storage::IsPartitionable( entry ) || - entry["readonly"]:false || Arch::s390(); + boolean ret = !Storage::IsPartitionable(entry) || entry["readonly"]:false; // for uEFI on x86_64 GPT is not mandatory if( !ret && Arch::ia64() && entry["label"]:"gpt"!="gpt" ) { Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/storage/src/inst_disk_proposal.ycp?rev=59566&r1=59565&r2=59566&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/inst_disk_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/inst_disk_proposal.ycp Mon Nov 16 14:13:35 2009 @@ -66,7 +66,7 @@ ]; map seq = $[]; seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next: `next ]; - if( Arch::s390() || Mode::autoinst() ) + if (Mode::autoinst()) { Storage::SetPartMode("PROP_MODIFY"); seq["ws_start"] = "disk"; @@ -112,11 +112,6 @@ } -if( Arch::s390() ) - { - return Storage::GetExitKey(); - } - // Title for dialogue string title = _("Suggested Partitioning"); // Radiobutton for partition dialog -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org