Author: locilka Date: Fri Oct 3 16:33:31 2008 New Revision: 51835 URL: http://svn.opensuse.org/viewcvs/yast?rev=51835&view=rev Log: - Enabling some steps in second stage even if Automatic Configuration is in use. - Feature added into openSUSE and SLED control files (both bnc #428190). Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/include/misc.ycp Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=51835&r1=51834&r2=51835&view=diff ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Fri Oct 3 16:33:31 2008 @@ -83,6 +83,12 @@ <enable_autoconfiguration config:type="boolean">true</enable_autoconfiguration> <autoconfiguration_default config:type="boolean">true</autoconfiguration_default> + <!-- BNC #428190, Some clients should be called even with AC --> + <autoconfiguration_enabled_modules config:type="list"> + <module>cont_suse_register</module> + <module>cont_suseconfig</module> + </autoconfiguration_enabled_modules> + <!-- Configuration for inst_automatic_configuration script --> <automatic_configuration config:type="list"> <!-- @@ -887,7 +893,8 @@ </module> <module> <label>Customer Center</label> - <name>suse_register</name> + <name>cont_suse_register</name> + <execute>inst_suse_register</execute> <enable_back>yes</enable_back> <enable_next>yes</enable_next> </module> @@ -924,8 +931,8 @@ <execute>inst_user</execute> </module> <module> - <label>Release Notes</label> - <name>suseconfig</name> + <name>cont_suseconfig</name> + <execute>inst_suseconfig</execute> <enable_back>no</enable_back> <enable_next>no</enable_next> </module> Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=51835&r1=51834&r2=51835&view=diff ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Fri Oct 3 16:33:31 2008 @@ -86,6 +86,12 @@ <enable_autoconfiguration config:type="boolean">true</enable_autoconfiguration> <autoconfiguration_default config:type="boolean">true</autoconfiguration_default> + <!-- BNC #428190, Some clients should be called even with AC --> + <autoconfiguration_enabled_modules config:type="list"> + <module>cont_suse_register</module> + <module>cont_suseconfig</module> + </autoconfiguration_enabled_modules> + <!-- FATE #303395, Kexec instead of reboot (default 'false') --> <kexec_reboot config:type="boolean">true</kexec_reboot> @@ -1168,7 +1174,8 @@ <execute>inst_user</execute> </module> <module> - <name>suseconfig</name> + <name>cont_suseconfig</name> + <execute>inst_suseconfig</execute> <enable_back>no</enable_back> <enable_next>no</enable_next> </module> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=51835&r1=51834&r2=51835&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Oct 3 16:33:31 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Oct 3 16:31:10 CEST 2008 - locilka@suse.cz + +- Enabling some steps in second stage even if Automatic + Configuration is in use. +- Feature added into openSUSE and SLED control files + (both bnc #428190). + +------------------------------------------------------------------- Thu Oct 2 22:00:46 CEST 2008 - mzugec@suse.de - changed Release Notes into Support group (bnc#430005) Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.ycp?rev=51835&r1=51834&r2=51835&view=diff ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Fri Oct 3 16:33:31 2008 @@ -24,6 +24,7 @@ import "Installation"; import "Mode"; import "ProductControl"; +import "ProductFeatures"; import "Label"; import "FileUtils"; import "Linuxrc"; @@ -205,15 +206,42 @@ return ( button == `confirm ); } + list <string> modules_to_enable_with_AC_on = nil; + + // Some client calls have to be called even if using AC + void EnableRequiredModules () { + // Lazy init + if (modules_to_enable_with_AC_on == nil) { + any feature = ProductFeatures::GetFeature ("globals", "autoconfiguration_enabled_modules"); + + if (feature == "" || feature == nil || feature == []) { + modules_to_enable_with_AC_on = []; + } else { + modules_to_enable_with_AC_on = (list <string>) feature; + } + + y2milestone ("Steps to enable with AC in use: %1", modules_to_enable_with_AC_on); + } + + if (modules_to_enable_with_AC_on != nil) { + foreach (string one_module, modules_to_enable_with_AC_on, { + ProductControl::EnableModule (one_module); + }); + } + } + void AdjustAutomaticConfiguration () { if (ProductControl::GetUseAutomaticConfiguration()) { y2milestone ("Using AC..."); - ProductControl::DisableAllModulesAndProposals ("installation", "continue"); - ProductControl::EnableModule ("automatic_configuration"); - // Enable SuSEConfig, bnc #381751 - ProductControl::EnableModule ("suseconfig"); + + ProductControl::DisableAllModulesAndProposals ("installation", "continue"); + ProductControl::EnableModule ("automatic_configuration"); + + // Enable Modules that are required to run even if using AC, bnc #428190 + EnableRequiredModules(); } else { y2milestone ("Not using AC..."); + ProductControl::UnDisableAllModulesAndProposals ("installation", "continue"); ProductControl::DisableModule ("automatic_configuration"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org