Author: aschnell
Date: Wed Aug 27 16:59:47 2008
New Revision: 50418
URL: http://svn.opensuse.org/viewcvs/yast?rev=50418&view=rev
Log:
- removed some evms code
Modified:
trunk/storage/storage/src/inst_disk_proposal.ycp
trunk/storage/storage/src/inst_target_part.ycp
trunk/storage/storage/src/modules/Storage.ycp
Modified: trunk/storage/storage/src/inst_disk_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_proposal.ycp?rev=50418&r1=50417&r2=50418&view=diff
==============================================================================
--- trunk/storage/storage/src/inst_disk_proposal.ycp (original)
+++ trunk/storage/storage/src/inst_disk_proposal.ycp Wed Aug 27 16:59:47 2008
@@ -136,7 +136,6 @@
string modify_str = "";
string detailed_str = "";
string lvm_str = "";
-string evms_str = "";
string part_str = "";
// Title for dialogue
@@ -149,8 +148,6 @@
part_str = _("&Partition Based");
// Radiobutton for partition dialog
lvm_str = _("&LVM Based");
-// Radiobutton for partition dialog
-evms_str = _("&EVMS Based");
string target_is = "";
@@ -196,7 +193,6 @@
`HBox(
`HSpacing(3),
`MinWidth(20,`Left( `RadioButton( `id(`part), `opt(`notify), part_str,
- !Storage::ProposalEvms() &&
!Storage::ProposalLvm() ))),
`HSpacing(3),
`MinWidth(20,`Left( `RadioButton( `id(`lvm), `opt(`notify), lvm_str,
@@ -204,15 +200,6 @@
`HSpacing(3)
);
-if( cfg["evms_config"]:false && false ) // No EVMS proposal for SLES10!!
- {
- boolean v = Storage::ProposalEvms() && !Storage::ProposalLvm();
- rframe = add( rframe, `HStretch() );
- rframe = add( rframe,
- `MinWidth(20,`Left( `RadioButton( `id(`evms), evms_str, v ))) );
- rframe = add( rframe, `HSpacing(3) );
- }
-
term bframe =
`HBox(
`PushButton( `id(`detailed), detailed_str ),
@@ -267,16 +254,9 @@
advanced options like RAID and encryption.</p>
"), deletechars(detailed_str,"&"));
-if( cfg["evms_config"]:false && false ) // No EVMS proposal for SLES10!!
- // help text continued
- // %1 is replaced by button text
- help_text = help_text + _("<p>
-To create an LVM or EVMS based proposal, choose the corresponding button.</p>
-");
-else
- // help text continued
- // %1 is replaced by button text
- help_text = help_text + _("<p>
+// help text continued
+// %1 is replaced by button text
+help_text = help_text + _("<p>
To create an LVM based proposal, choose the corresponding button.</p>
");
@@ -308,20 +288,15 @@
if( ret == `abort && Popup::ReallyAbort(true) )
return `abort;
- if( contains( [ `lvm, `evms, `part ], ret ) )
+ if( contains( [ `lvm, `part ], ret ) )
{
if( AskOverwriteChanges() )
{
target_is = "SUGGESTION";
if( ret==`lvm )
Storage::SetProposalLvm(true);
- else if( ret==`evms )
- Storage::SetProposalEvms(true);
else
- {
Storage::SetProposalLvm(false);
- Storage::SetProposalEvms(false);
- }
Storage::ResetOndiskTarget();
Storage::AddMountPointsForWin(Storage::GetTargetMap());
map prop = get_inst_prop( Storage::GetTargetMap());
@@ -376,8 +351,6 @@
{
if( Storage::ProposalLvm() )
UI::ChangeWidget( `id("prop_mode"), `CurrentButton, `lvm );
- else if( Storage::ProposalEvms() )
- UI::ChangeWidget( `id("prop_mode"), `CurrentButton, `evms );
else
UI::ChangeWidget( `id("prop_mode"), `CurrentButton, `part );
}
Modified: trunk/storage/storage/src/inst_target_part.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_part.ycp?rev=50418&r1=50417&r2=50418&view=diff
==============================================================================
--- trunk/storage/storage/src/inst_target_part.ycp (original)
+++ trunk/storage/storage/src/inst_target_part.ycp Wed Aug 27 16:59:47 2008
@@ -201,12 +201,6 @@
if ( win_partition != $[] ) open_auto_dialog_resize (targetname, vbox);
else open_auto_dialog (targetname, vbox);
- if( UI::WidgetExists( `id(`evms) ))
- {
- y2milestone( "UI::WidgetExists evms label:%1", target["label"]:"" );
- if( target["label"]:""!="msdos" && !Storage::BootEvms() )
- UI::ChangeWidget( `id(`evms), `Enabled, false );
- }
boolean disable_full = false;
foreach( map p, partitions,
``{
@@ -233,11 +227,7 @@
ret = (symbol)Wizard::UserInput();
y2milestone( "USERINPUT ret %1", ret );
- if( ret == `lvm && UI::WidgetExists(`id(`evms)) )
- UI::ChangeWidget( `id(`evms), `Value, false );
- else if( ret == `evms && UI::WidgetExists(`id(`lvm)) )
- UI::ChangeWidget( `id(`lvm), `Value, false );
- else if( ret == `abort && Popup::ReallyAbort(true))
+ if( ret == `abort && Popup::ReallyAbort(true))
{
break;
}
@@ -411,13 +401,8 @@
Storage::SetProposalHome( (boolean)UI::QueryWidget( `id(`home), `Value ));
if( (boolean)UI::QueryWidget( `id(`lvm), `Value )==true )
Storage::SetProposalLvm(true);
- else if( (boolean)UI::QueryWidget( `id(`evms), `Value )==true )
- Storage::SetProposalEvms(true);
else
- {
- Storage::SetProposalEvms(false);
Storage::SetProposalLvm(false);
- }
ok = create_partitions( targetMap, target, partitions );
Storage::SetProposalDefault(true);
if( !ok )
Modified: trunk/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=50418&r1=50417&r2=50418&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Wed Aug 27 16:59:47 2008
@@ -164,7 +164,6 @@
`CT_LOOP : 4, `CT_DM : 5, `CT_LVM : 6, `CT_NFS : 7 ];
list<string> hw_packages = [];
list<string> no_propose_disks = nil;
-boolean proposal_evms = false;
boolean proposal_lvm = false;
boolean proposal_home = false;
map