Author: mzugec
Date: Thu Nov 5 10:44:51 2009
New Revision: 59315
URL: http://svn.opensuse.org/viewcvs/yast?rev=59315&view=rev
Log:
lan module in 1st stage (FaTE#303069)
Modified:
branches/SuSE-Code-11-SP1-Branch/installation/VERSION
branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml
branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml
branches/SuSE-Code-11-SP1-Branch/installation/control/control.openSUSE.xml
branches/SuSE-Code-11-SP1-Branch/installation/control/control.xml
branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes
branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_continue.ycp
branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_initial.ycp
branches/SuSE-Code-11-SP1-Branch/installation/src/include/inst_inc_all.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/VERSION?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/VERSION Thu Nov 5 10:44:51 2009
@@ -1 +1 @@
-2.17.56
+2.17.57
Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml Thu Nov 5 10:44:51 2009
@@ -531,6 +531,12 @@
yes
</module>
<module>
+ <label>Network Activation</label>
+ <name>lan</name>
+ yes
+ yes
+ </module>
+ <module>
<label>Disk Activation</label>
<name>disks_activate</name>
yes
Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml Thu Nov 5 10:44:51 2009
@@ -673,6 +673,12 @@
yes
</module>
<module>
+ <label>Network Activation</label>
+ <name>lan</name>
+ yes
+ yes
+ </module>
+ <module>
<label>Disk Activation</label>
<name>disks_activate</name>
yes
Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/control.openSUSE.xml?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/control/control.openSUSE.xml (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.openSUSE.xml Thu Nov 5 10:44:51 2009
@@ -598,6 +598,10 @@
<retranslate config:type="boolean">true</retranslate>
</module>
<module>
+ <label>Network Activation</label>
+ <name>lan</name>
+ </module>
+ <module>
<label>Disk Activation</label>
<name>disks_activate</name>
</module>
Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/control.xml?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/control/control.xml (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.xml Thu Nov 5 10:44:51 2009
@@ -351,6 +351,12 @@
yes
</module>
<module>
+ <label>Network Activation</label>
+ <name>lan</name>
+ yes
+ yes
+ </module>
+ <module>
<label>Disk Activation</label>
<name>disks_activate</name>
yes
Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Thu Nov 5 10:44:51 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Nov 5 10:34:16 CET 2009 - mzugec@suse.de
+
+- lan module in 1st stage (FaTE#303069)
+- 2.17.57
+
+-------------------------------------------------------------------
Thu Oct 29 12:28:14 CET 2009 - jsrain@suse.cz
- limit the number of the searched disks to 8 of each kind to
Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_continue.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_continue.ycp?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_continue.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_continue.ycp Thu Nov 5 10:44:51 2009
@@ -57,6 +57,8 @@
AdjustDisabledItems();
+ SetNetworkActivationModule();
+
SetDiskActivationModule();
UpdateWizardSteps ();
Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_initial.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_initial.ycp?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_initial.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_worker_initial.ycp Thu Nov 5 10:44:51 2009
@@ -55,6 +55,8 @@
// All stages
SetUIContent();
+ SetNetworkActivationModule();
+
SetDiskActivationModule();
// Cleanup and other settings
Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/include/inst_inc_all.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/src/include/inst_inc_all.ycp?rev=59315&r1=59314&r2=59315&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/installation/src/include/inst_inc_all.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/installation/src/include/inst_inc_all.ycp Thu Nov 5 10:44:51 2009
@@ -172,6 +172,16 @@
return;
}
+ void SetNetworkActivationModule () {
+ // update the workflow according to current situation
+ // disable lan activation if not needed
+
+ if (!(Linuxrc::InstallInf("ConfigureNetwork")=="1") ) {
+ y2milestone ("Disabling network activation module");
+ ProductControl::DisableModule ("lan");
+ }
+ }
+
void SetDiskActivationModule () {
// update the workflow according to current situation
// disable disks activation if not needed
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
mzugec＠svn.opensuse.org