Author: locilka Date: Tue Apr 1 13:13:47 2008 New Revision: 45927 URL: http://svn.opensuse.org/viewcvs/yast?rev=45927&view=rev Log: - Automatic configuration can be newly defined by control file. Two new variables have been added enable_autoconfiguration and autoconfiguration_default. Modified: trunk/installation/control/control.openSUSE.xml trunk/installation/control/docs/control-section.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_mode.ycp trunk/installation/src/include/inst_inc_first.ycp trunk/installation/src/include/misc.ycp trunk/installation/src/modules/InstData.ycp Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=45927&r1=45926&r2=45927&view=diff ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Tue Apr 1 13:13:47 2008 @@ -38,6 +38,10 @@ /root/inst-sys/ + + <!-- FATE #303396, Make second stage non-interactive --> + true + true </globals> <software> Modified: trunk/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/control-section.xml?rev=45927&r1=45926&r2=45927&view=diff ============================================================================== --- trunk/installation/control/docs/control-section.xml (original) +++ trunk/installation/control/docs/control-section.xml Tue Apr 1 13:13:47 2008 @@ -358,17 +358,31 @@ <itemizedlist> <listitem><para>(boolean) <emphasis>enable_firewall</emphasis> - firewall will proposed as either enabled or disabled in the network proposal.</para></listitem> + <listitem><para>(boolean) <emphasis>enable_clone</emphasis> - clonning feature will be either enabled or disabled.</para></listitem> + <listitem><para>(boolean) <emphasis>skip_language_dialog</emphasis> - the language dialog might be skipped (if language already selected).</para></listitem> + <listitem><para>(boolean) <emphasis>show_online_repositories</emphasis> - either shows or hides the "online repositories" feature check-box.</para></listitem> + <!-- bnc #359115 comment #14 --> <listitem><para>(boolean) <emphasis>root_password_as_first_user</emphasis> - automatically selects or deselects the checkbox that makes Users configuration to set the password entered for a first user also for the user root. If not defined, default is <emphasis>false</emphasis></para></listitem> + + <!-- FATE #303396: Make second stage non-interactive --> + <listitem><para>(boolean) <emphasis>enable_autoconfiguration</emphasis> - enables a check box + in dialog that offers to switch the automatic configuration either on or off. + Default is false.</para></listitem> + + <listitem><para>(boolean) <emphasis>autoconfiguration_default</emphasis> - defines a default + value whether to use the automatic configuration. It works even if + <emphasis>enable_autoconfiguration</emphasis> is turned off, but user would not be able + to change it. Default is false.</para></listitem> </itemizedlist> </section> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45927&r1=45926&r2=45927&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 1 13:13:47 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 1 13:12:00 CEST 2008 - locilka@suse.cz + +- Automatic configuration can be newly defined by control file. Two + new variables have been added enable_autoconfiguration and + autoconfiguration_default. + +------------------------------------------------------------------- Tue Apr 1 12:36:52 CEST 2008 - jsrain@suse.cz - added live installation workflow to default control file Modified: trunk/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mode.ycp?rev=45927&r1=45926&r2=45927&view=diff ============================================================================== --- trunk/installation/src/clients/inst_mode.ycp (original) +++ trunk/installation/src/clients/inst_mode.ycp Tue Apr 1 13:13:47 2008 @@ -172,12 +172,16 @@ _("In&clude Add-On Products from Separate Media"), Installation::add_on_selected )), - `Left (`CheckBox ( - `id (`use_automatic_configuration), `opt(`notify), - // check box - _("&Use Automatic Configuration"), - ProductControl::GetUseAutomaticConfiguration() - )) + (InstData::enable_autoconfiguration == true ? + `Left (`CheckBox ( + `id (`use_automatic_configuration), `opt(`notify), + // check box + _("&Use Automatic Configuration"), + ProductControl::GetUseAutomaticConfiguration() + )) + : + `Empty() + ) ), `HStretch() ); Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_first.ycp?rev=45927&r1=45926&r2=45927&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Tue Apr 1 13:13:47 2008 @@ -21,6 +21,9 @@ import "FileUtils"; import "String"; import "Mode"; + import "ProductFeatures"; + + include "installation/misc.ycp"; void InitMouse () { if (!Arch::s390 () || Arch::board_iseries ()) { @@ -43,8 +46,16 @@ ProductControl::DisableModule ("add-on"); ProductControl::DisableModule ("productsources"); + // FATE #303396, Make second stage non-interactive + boolean enable_autoconfiguration = ProductFeatures::GetBooleanFeature ("globals", "enable_autoconfiguration"); + boolean autoconfiguration_default = ProductFeatures::GetBooleanFeature ("globals", "autoconfiguration_default"); + // Enabled only when AC is selected - ProductControl::DisableModule ("automatic_configuration"); + InstData::enable_autoconfiguration = (enable_autoconfiguration == true); + // Default state + ProductControl::SetUseAutomaticConfiguration (autoconfiguration_default == true); + // Enables or disables some modules, etc. + AdjustAutomaticInstallation(); // First-stage users module will enable them again only if needed ProductControl::DisableModule ("root"); Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.ycp?rev=45927&r1=45926&r2=45927&view=diff ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Tue Apr 1 13:13:47 2008 @@ -208,7 +208,7 @@ return ( button == `confirm ); } - void AdjustStepsAccordingToInstallationSettings () { + void AdjustAutomaticInstallation () { if (ProductControl::GetUseAutomaticConfiguration()) { ProductControl::DisableAllModulesAndProposals ("installation", "continue"); ProductControl::EnableModule ("automatic_configuration"); @@ -216,6 +216,10 @@ ProductControl::UnDisableAllModulesAndProposals ("installation", "continue"); ProductControl::DisableModule ("automatic_configuration"); } + } + + void AdjustStepsAccordingToInstallationSettings () { + AdjustAutomaticInstallation(); if (Installation::add_on_selected == true) { ProductControl::EnableModule ("add-on"); Modified: trunk/installation/src/modules/InstData.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstData.ycp?rev=45927&r1=45926&r2=45927&view=diff ============================================================================== --- trunk/installation/src/modules/InstData.ycp (original) +++ trunk/installation/src/modules/InstData.ycp Tue Apr 1 13:13:47 2008 @@ -48,6 +48,10 @@ global list <string> localDisabledModules = []; global list <string> localDisabledProposals = []; + // FATE #303396, Non-interactive second stage + // this variable enables a check box in dialog + global boolean enable_autoconfiguration = false; + // <-- other /* EOF */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org