Author: mzugec
Date: Wed Nov 4 16:32:29 2009
New Revision: 59301
URL: http://svn.opensuse.org/viewcvs/yast?rev=59301&view=rev
Log:
lan module in 1st stage (FaTE#303069)
Modified:
trunk/installation/VERSION
trunk/installation/control/control.SLED.xml
trunk/installation/control/control.SLES.xml
trunk/installation/control/control.openSUSE.xml
trunk/installation/control/control.xml
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_worker_continue.ycp
trunk/installation/src/clients/inst_worker_initial.ycp
trunk/installation/src/include/inst_inc_all.ycp
Modified: trunk/installation/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/VERSION (original)
+++ trunk/installation/VERSION Wed Nov 4 16:32:29 2009
@@ -1 +1 @@
-2.18.33
+2.18.34
Modified: trunk/installation/control/control.SLED.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/control/control.SLED.xml (original)
+++ trunk/installation/control/control.SLED.xml Wed Nov 4 16:32:29 2009
@@ -549,6 +549,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: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Wed Nov 4 16:32:29 2009
@@ -684,6 +684,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: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Wed Nov 4 16:32:29 2009
@@ -620,6 +620,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: trunk/installation/control/control.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.xml?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/control/control.xml (original)
+++ trunk/installation/control/control.xml Wed Nov 4 16:32:29 2009
@@ -339,6 +339,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: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Wed Nov 4 16:32:29 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Nov 4 16:31:17 CET 2009 - mzugec@suse.cz
+
+- lan module in 1st stage (FaTE#303069)
+- 2.18.34
+
+-------------------------------------------------------------------
Fri Oct 23 07:40:56 CEST 2009 - jsuchome@suse.cz
- during update, do not save timezone and console settings
Modified: trunk/installation/src/clients/inst_worker_continue.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_worker_continue.ycp?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_worker_continue.ycp (original)
+++ trunk/installation/src/clients/inst_worker_continue.ycp Wed Nov 4 16:32:29 2009
@@ -57,6 +57,8 @@
AdjustDisabledItems();
+ SetNetworkActivationModule();
+
SetDiskActivationModule();
UpdateWizardSteps ();
Modified: trunk/installation/src/clients/inst_worker_initial.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_worker_initial.ycp?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_worker_initial.ycp (original)
+++ trunk/installation/src/clients/inst_worker_initial.ycp Wed Nov 4 16:32:29 2009
@@ -55,6 +55,8 @@
// All stages
SetUIContent();
+ SetNetworkActivationModule();
+
SetDiskActivationModule();
// Cleanup and other settings
Modified: trunk/installation/src/include/inst_inc_all.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_all.ycp?rev=59301&r1=59300&r2=59301&view=diff
==============================================================================
--- trunk/installation/src/include/inst_inc_all.ycp (original)
+++ trunk/installation/src/include/inst_inc_all.ycp Wed Nov 4 16:32:29 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
