Author: jsuchome Date: Wed Apr 27 15:44:48 2011 New Revision: 63876 URL: http://svn.opensuse.org/viewcvs/yast?rev=63876&view=rev Log: - added option to configure FCoE Interfaces when started with WithFCoE=1 argument (fate#307445) - 2.17.79 Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/VERSION?rev=63876&r1=63875&r2=63876&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Wed Apr 27 15:44:48 2011 @@ -1 +1 @@ -2.17.78 +2.17.79 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes?rev=63876&r1=63875&r2=63876&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Wed Apr 27 15:44:48 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 27 15:09:25 CEST 2011 - jsuchome@suse.cz + +- added option to configure FCoE Interfaces when started with + WithFCoE=1 argument (fate#307445) +- 2.17.79 + +------------------------------------------------------------------- Wed Apr 27 11:24:45 CEST 2011 - jsuchome@suse.cz - Copy /media.1/build to the installed system (fate#311377) Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp?rev=63876&r1=63875&r2=63876&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp Wed Apr 27 15:44:48 2011 @@ -23,6 +23,7 @@ import "Arch"; import "GetInstArgs"; import "Label"; +import "Linuxrc"; import "Popup"; import "Storage"; import "Wizard"; @@ -32,6 +33,7 @@ boolean have_dasd = false; boolean have_zfcp = false; +boolean want_fcoe = false; void RestoreButtons (boolean enable_back, boolean enable_next) { Wizard::RestoreAbortButton(); @@ -72,7 +74,9 @@ UI::CloseDialog (); } -if (have_dasd || have_zfcp) +want_fcoe = Linuxrc::InstallInf ("WithFCoE") == "1"; + +if (have_dasd || have_zfcp || want_fcoe) { // dialog caption string caption = _("Disk Activation"); @@ -93,6 +97,12 @@ _("Configure &ZFCP Disks"))) : `VSpacing (0), `VSpacing (have_zfcp ? 2 : 0), + want_fcoe + ? `HWeight (1, `PushButton (`id (`fcoe), `opt (`hstretch), + // push button + _("Configure &FCoE Interfaces"))) + : `VSpacing (0), + `VSpacing (want_fcoe? 2 : 0), `HWeight (1, `PushButton (`id (`iscsi), `opt (`hstretch), // push button _("Configure &iSCSI Disks"))), @@ -121,7 +131,12 @@ } else if (ret == `iscsi) { - ret = WFM::call ("inst_iscsi-client"); + ret = WFM::call ("inst_iscsi-client", [argmap]); + ret = `redraw; + } + else if (ret == `fcoe) + { + ret = WFM::call ("inst_fcoe-client", [argmap]); ret = `redraw; } if (ret == `redraw) Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp?rev=63876&r1=63875&r2=63876&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp Wed Apr 27 15:44:48 2011 @@ -199,8 +199,9 @@ // update the workflow according to current situation // disable disks activation if not needed boolean iscsi = Linuxrc::InstallInf("WithiSCSI") == "1"; + boolean fcoe = Linuxrc::InstallInf ("WithFCoE") == "1"; - if (! (Arch::s390() || iscsi)) { + if (! (Arch::s390() || iscsi || fcoe)) { y2milestone ("Disabling disk activation module"); ProductControl::DisableModule ("disks_activate"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org