Author: locilka
Date: Wed Mar 5 18:55:29 2008
New Revision: 45244
URL: http://svn.opensuse.org/viewcvs/yast?rev=45244&view=rev
Log:
- Remember (first stage) and restore (second stage) DisabledModules
(bnc #364066).
- 2.16.20
Added:
trunk/installation/src/clients/inst_installation_settings.ycp
Modified:
trunk/installation/VERSION
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_finish.ycp
trunk/installation/src/clients/inst_worker_continue.ycp
trunk/installation/src/include/inst_inc_second.ycp
trunk/installation/src/modules/InstData.ycp
Modified: trunk/installation/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=45244&r1=45243&r2=45244&view=diff
==============================================================================
--- trunk/installation/VERSION (original)
+++ trunk/installation/VERSION Wed Mar 5 18:55:29 2008
@@ -1 +1 @@
-2.16.19
+2.16.20
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45244&r1=45243&r2=45244&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Wed Mar 5 18:55:29 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Mar 5 18:52:30 CET 2008 - locilka@suse.cz
+
+- Remember (first stage) and restore (second stage) DisabledModules
+ (bnc #364066).
+- 2.16.20
+
+-------------------------------------------------------------------
Wed Mar 5 16:30:22 CET 2008 - locilka@suse.cz
- Using client country_simple instead of timezone and language in
Modified: trunk/installation/src/clients/inst_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_finish.ycp?rev=45244&r1=45243&r2=45244&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_finish.ycp (original)
+++ trunk/installation/src/clients/inst_finish.ycp Wed Mar 5 18:55:29 2008
@@ -84,6 +84,7 @@
"save_hw_status",
"users",
"autoinst_scripts2",
+ "installation_settings",
],
],
$[
Added: trunk/installation/src/clients/inst_installation_settings.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_installation_settings.ycp?rev=45244&view=auto
==============================================================================
--- trunk/installation/src/clients/inst_installation_settings.ycp (added)
+++ trunk/installation/src/clients/inst_installation_settings.ycp Wed Mar 5 18:55:29 2008
@@ -0,0 +1,42 @@
+/**
+ * File: clients/inst_installation_settings.ycp
+ * Package: Installation
+ * Summary: Installation - save settings (used later in second stage, or ...).
+ * See bnc #364066.
+ * Authors: Lukas Ocilka
+ *
+ * $Id:$
+ *
+ */
+
+{
+ textdomain "installation";
+
+ import "ProductControl";
+ import "InstData";
+
+ if (ProductControl::DisabledModules == nil) {
+ y2error ("Wrong definition of DisabledModules");
+ return true;
+ }
+
+ if (InstData::wizardsteps_disabled_modules == nil) {
+ y2error ("Path to write disabled modules is not defined!");
+ return true;
+ }
+
+ y2milestone (
+ "Writing disabled modules %1 into %2",
+ ProductControl::DisabledModules,
+ InstData::wizardsteps_disabled_modules
+ );
+
+ if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_modules, ProductControl::DisabledModules) != true) {
+ y2error ("Cannot write disabled modules");
+ return true;
+ }
+
+ y2milestone ("Successful");
+
+ return true;
+}
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=45244&r1=45243&r2=45244&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_worker_continue.ycp (original)
+++ trunk/installation/src/clients/inst_worker_continue.ycp Wed Mar 5 18:55:29 2008
@@ -54,6 +54,8 @@
// All stages
SetUIContent();
+ AdjustDisabledModules();
+
SetDiskActivationModule();
UpdateWizardSteps ();
Modified: trunk/installation/src/include/inst_inc_second.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_second.ycp?rev=45244&r1=45243&r2=45244&view=diff
==============================================================================
--- trunk/installation/src/include/inst_inc_second.ycp (original)
+++ trunk/installation/src/include/inst_inc_second.ycp Wed Mar 5 18:55:29 2008
@@ -24,11 +24,33 @@
import "Service";
import "Progress";
import "Wizard";
+ import "InstData";
// The order of services is important
// especially for starting them
list <string> inst_network_services = ["network", "portmap", "SuSEfirewall2_setup"];
+ void AdjustDisabledModules () {
+ if (InstData::wizardsteps_disabled_modules == nil) {
+ y2error ("Disabled modules file not defined");
+ return;
+ }
+
+ if (! FileUtils::Exists (InstData::wizardsteps_disabled_modules)) {
+ y2milestone ("File %1 doesn't exist, skipping...", InstData::wizardsteps_disabled_modules);
+ return;
+ }
+
+ list <string> disabled_modules = (list <string>) SCR::Read (.target.ycp, InstData::wizardsteps_disabled_modules);
+ if (disabled_modules == nil) {
+ y2error ("Error reading %1", InstData::wizardsteps_disabled_modules);
+ return;
+ }
+
+ ProductControl::DisabledModules = disabled_modules;
+ y2milestone ("Disabled modules set to %1", ProductControl::DisabledModules);
+ }
+
/**
* Stores the current status of network services into
* Installation::reboot_net_settings file
Modified: trunk/installation/src/modules/InstData.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstData.ycp?rev=45244&r1=45243&r2=45244&view=diff
==============================================================================
--- trunk/installation/src/modules/InstData.ycp (original)
+++ trunk/installation/src/modules/InstData.ycp Wed Mar 5 18:55:29 2008
@@ -15,6 +15,8 @@
textdomain "installation";
module "InstData";
+ import "Directory";
+
// --> system analysis
global string start_mode = nil;
@@ -37,6 +39,10 @@
global boolean product_license_accepted = false;
+ // keep steps disabled in first stage also disabled in second stage
+ // see bnc #364066
+ global string wizardsteps_disabled_modules = Directory::vardir + "/installation_disabled_steps";
+
// <-- other
/* EOF */
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
