[yast-commit] r45467 - in /trunk/installation: ./ package/ src/clients/ src/include/ src/modules/ startup/

14 Mar 2008

Author: locilka
Date: Fri Mar 14 15:09:21 2008
New Revision: 45467

URL: http://svn.opensuse.org/viewcvs/yast?rev=45467&view=rev
Log:
- Added possibility to run automatic configuration instead of the
  whole second stage installation (fate #303396).
- Adjusted RPM dependencies.
- Creating and removing the file runme_at_boot is currently handled
  by YaST (YCP) installation scripts.


Added:
    trunk/installation/src/clients/automatic_configuration_finish.ycp
    trunk/installation/src/clients/inst_automatic_configuration.ycp
Modified:
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/clients/inst_finish.ycp
    trunk/installation/src/clients/inst_installation_settings.ycp
    trunk/installation/src/clients/inst_mode.ycp
    trunk/installation/src/clients/inst_proposal.ycp
    trunk/installation/src/clients/inst_suseconfig.ycp
    trunk/installation/src/clients/inst_worker_continue.ycp
    trunk/installation/src/clients/inst_worker_initial.ycp
    trunk/installation/src/clients/yast_inf_finish.ycp
    trunk/installation/src/include/inst_inc_all.ycp
    trunk/installation/src/include/inst_inc_first.ycp
    trunk/installation/src/include/inst_inc_second.ycp
    trunk/installation/src/include/misc.ycp
    trunk/installation/src/modules/InstData.ycp
    trunk/installation/startup/YaST2.call
    trunk/installation/yast2-installation.spec.in

Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================

--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Fri Mar 14 15:09:21 2008
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Fri Mar 14 15:02:27 CET 2008 - locilka@suse.cz
+
+- Added possibility to run automatic configuration instead of the
+  whole second stage installation (fate #303396).
+- Adjusted RPM dependencies.
+- Creating and removing the file runme_at_boot is currently handled
+  by YaST (YCP) installation scripts.
+
+-------------------------------------------------------------------
 Mon Mar 10 11:25:57 CET 2008 - locilka@suse.cz
 
 - Disabling the window menu in IceWM preferences to make the

Added: trunk/installation/src/clients/automatic_configuration_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/automatic_configuration_finish.ycp?rev=45467&view=auto
==============================================================================
--- trunk/installation/src/clients/automatic_configuration_finish.ycp (added)
+++ trunk/installation/src/clients/automatic_configuration_finish.ycp Fri Mar 14 15:09:21 2008
@@ -0,0 +1,105 @@
+/**
+ * File:	clients/automatic_configuration_finish.ycp
+ * Package:	installation
+ * Summary:	Automatic configuration instead of the second stage (Preview)
+ * Authors:	Lukas Ocilka 
+ * ThanksTo:	Martin Vidner 
+ *		Ladislav Slezak 
+ *
+ * $Id:$
+ *
+ * @see http://visnov.blogspot.com/2008/02/getting-rid-of-2nd-stage-of.html
+ */
+
+{
+    import "Report";
+    import "FileUtils";
+    import "Installation";
+    import "ProductControl";
+
+    textdomain "installation";
+
+    any ret = nil;
+    string func = "";
+    map param = $[];
+
+    /* Check arguments */
+    if(size(WFM::Args()) > 0 && is (WFM::Args (0), string)) {
+	func = (string) WFM::Args (0);
+	if (size (WFM::Args()) > 1 && is (WFM::Args (1), map))
+	    param = (map) WFM::Args (1);
+    }
+    y2milestone ("starting automatic_configuration_finish");
+    y2debug("func=%1", func);
+    y2debug("param=%1", param);
+
+    // functions -->
+
+    string zypp_lock_file = "/var/run/zypp.pid";
+
+    void RemoveZyppLockIfExists () {
+	// a bit cruel, remove the zypp log if exists
+	if (FileUtils::Exists (zypp_lock_file)) {
+	    y2milestone ("Removing zypp lock %1", zypp_lock_file);
+	    SCR::Execute (.target.remove, zypp_lock_file);
+	}
+    }
+
+    void Write () {
+	// Just to be sure...
+	Pkg::SourceFinishAll();
+	Pkg::TargetFinish();
+
+	RemoveZyppLockIfExists();
+	// FIXME: should be done somehow else and somewhere else...?
+	if (! FileUtils::Exists ("/mnt/etc/install.inf")) {
+	    y2milestone ("Copying install.inf");
+	    WFM::Execute (.local.bash, "cp /etc/install.inf /mnt/etc/install.inf");
+	}
+
+	// FIXME: just for testing
+	if (! FileUtils::Exists ("/mnt/share/YaST2/clients/inst_automatic_configuration.ycp")) {
+	    Report::Message ("Copy all clients to the just installed system");
+	}
+
+	y2milestone ("~~~ MAGIC! -----------------------------------------------------------------");
+
+	integer old_SCR = WFM::SCRGetDefault();
+	integer new_SCR = WFM::SCROpen ("chroot="+Installation::destdir+":scr", false);
+	WFM::SCRSetDefault (new_SCR);
+
+	RemoveZyppLockIfExists();
+	y2milestone ("Running autoconf - a separate YaST process");
+	// FIXME: Y2DEBUG is used just for debugging purpose
+	string cmd = "Y2DEBUG=1 /usr/lib/YaST2/bin/y2base /usr/share/YaST2/clients/inst_automatic_configuration.ycp UI";
+	// FIXME: use process agent
+	//        and use lome logging to file and `tail -F` from here
+	map cmd_ret = (map) SCR::Execute (.target.bash_output, cmd);
+	y2milestone ("Command '%1' returned %2", cmd, cmd_ret);
+
+	WFM::SCRClose (new_SCR);
+	WFM::SCRSetDefault (old_SCR);
+
+	y2milestone ("~~~ MAGIC! -----------------------------------------------------------------");
+    }
+
+    // <-- functions
+
+    // main()
+    if (func == "Info") {
+	ret = (any) $[
+	    "steps" : 1,
+	    // progress step title
+	    "title" : _("Writing automatic configuration..."),
+	    // only when requested
+	    "when" : (ProductControl::GetUseAutomaticConfiguration() == true ? [ `installation ] : []),
+	];
+    } else if (func == "Write") {
+	Write();
+    } else {
+	y2error ("unknown function: %1", func);
+	ret = nil;
+    }
+
+    return ret;
+}

Added: trunk/installation/src/clients/inst_automatic_configuration.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_automatic_configuration.ycp?rev=45467&view=auto
==============================================================================
--- trunk/installation/src/clients/inst_automatic_configuration.ycp (added)
+++ trunk/installation/src/clients/inst_automatic_configuration.ycp Fri Mar 14 15:09:21 2008
@@ -0,0 +1,130 @@
+/**
+ * File:	clients/inst_automatic_configuration.ycp
+ * Package:	installation
+ * Summary:	Automatic configuration instead of the second stage (Preview)
+ * Authors:	Lukas Ocilka 
+ *
+ * $Id:$
+ *
+ * @see http://visnov.blogspot.com/2008/02/getting-rid-of-2nd-stage-of.html
+ */
+
+{
+    import "Mode";
+    import "Stage";
+    import "FileUtils";
+    import "Directory";
+
+    textdomain "installation";
+
+    y2milestone ("automatic_configuration started");
+
+    Mode::SetMode ("installation");
+    Stage::Set ("continue");
+
+    list  > proposal_scripts_to_call = [
+	// probably needed
+	$[ "type":"scripts",   "items":["netprobe"] ],
+	// network proposal
+	$[ "type":"proposals", "items":["lan", "general", "dsl", "isdn", "modem", "remote", "firewall"] ],
+	// hardware proposal
+	$[ "type":"proposals", "items":["x11", "printer", "sound", "tv"] ],
+	// probably needed
+	$[ "type":"scripts",   "items":["suseconfig", "save_hardware_status"] ],
+    ];
+
+    // weird exception for users
+    if (FileUtils::Exists (Directory::vardir + "/users_first_stage.ycp")) {
+	y2milestone ("Users will be called");
+	proposal_scripts_to_call = add (proposal_scripts_to_call, $[ "type":"scripts", "items":["user"] ]);
+    }
+
+    /**
+     * Prepares the list of installation scripts to be executed.
+     * This comes from control file where scripts are mentioned without the leading
+     * "inst_" but they are actually named that way ("inst_something").
+     *
+     * @example ["aa", "inst_bb"] -> ["inst_aa", "inst_bb"]
+     */
+    list <string> NormalizeScriptNames (list <string> names) {
+	list <string> ret_names = [];
+
+	foreach (string one_name, names, {
+	    if (regexpmatch (one_name, "^inst_")) {
+		ret_names = add (ret_names, one_name);
+	    } else {
+		ret_names = add (ret_names, "inst_" + one_name);
+	    }
+	});
+
+	return ret_names;
+    }
+
+    /**
+     * Similar to NormalizeScriptNames but it add "_proposal" instead if "inst_".
+     *
+     * @example ["aa", "bb_proposal"] -> ["aa_proposal", "bb_proposal"]
+     */
+    list <string> NormalizeProposalNames (list <string> names) {
+	list <string> ret_names = [];
+
+	foreach (string one_name, names, {
+	    if (regexpmatch (one_name, "_proposal$")) {
+		ret_names = add (ret_names, one_name);
+	    } else {
+		ret_names = add (ret_names, one_name + "_proposal");
+	    }
+	});
+
+	return ret_names;
+    }
+
+    void CallScripts (list <string> scripts_to_call) {
+	y2milestone ("Scripts to call: %1", scripts_to_call);
+
+	scripts_to_call = NormalizeScriptNames (scripts_to_call);
+
+	foreach (string one_script, scripts_to_call, {
+	    y2milestone ("Calling script %1", one_script);
+	    any result = WFM::CallFunction (one_script, [ $["WriteOnly":true, "AutomaticConfiguration":true] ]);
+	    y2milestone ("Script %1 returned %2", one_script, result);
+	});
+    }
+
+    void CallProposals (list <string> proposals_to_call) {
+	y2milestone ("Scripts to call: %1", proposals_to_call);
+
+	proposals_to_call = NormalizeProposalNames (proposals_to_call);
+
+	// $[ "WriteOnly":true ] used to determine that we just want to write the proposed
+	// configuration, we don't want to (re)start anything (network, cups, firewall, ...)
+
+	foreach (string one_proposal, proposals_to_call, {
+	    y2milestone ("Calling script %1 MakeProposal", one_proposal);
+	    any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "WriteOnly":true, "AutomaticConfiguration":true ]]);
+	    y2milestone ("Script %1 returned %2", one_proposal, result);
+	});
+
+	foreach (string one_proposal, proposals_to_call, {
+	    y2milestone ("Calling script %1 Write", one_proposal);
+	    any result = WFM::CallFunction (one_proposal, ["Write", $[ "WriteOnly":true, "AutomaticConfiguration":true ]]);
+	    y2milestone ("Script %1 returned %2", one_proposal, result);
+	});
+    }
+
+    foreach (map one_autoconf_call, proposal_scripts_to_call, {
+	string type = one_autoconf_call["type"]:"";
+
+	switch (type) {
+	    case "scripts":
+		CallScripts (one_autoconf_call["items"]:[]);
+		break;
+	    case "proposals":
+		CallProposals (one_autoconf_call["items"]:[]);
+		break;
+	    y2error ("Unknown script type '%1'", type);
+	}
+    });
+
+    y2milestone ("automatic_configuration finished");
+}

Modified: trunk/installation/src/clients/inst_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_finish.ycp?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_finish.ycp (original)
+++ trunk/installation/src/clients/inst_finish.ycp Fri Mar 14 15:09:21 2008
@@ -93,10 +93,13 @@
 	"steps" : [
 	    "vm",
 	    "driver_update2",
+	    // no second stage if possible
 	    "pre_umount",
 	    // copy logs just before 'umount'
 	    // keeps maximum logs available after reboot
 	    "copy_logs",
+	    // runs a separate process in SCR (chrooted)
+	    "automatic_configuration",
 	    "umount",
 	],
     ],

Modified: trunk/installation/src/clients/inst_installation_settings.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_installation_settings.ycp?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_installation_settings.ycp (original)
+++ trunk/installation/src/clients/inst_installation_settings.ycp Fri Mar 14 15:09:21 2008
@@ -15,7 +15,7 @@
     import "ProductControl";
     import "InstData";
 
-    if (ProductControl::DisabledModules == nil) {
+    if (ProductControl::GetDisabledModules() == nil) {
 	y2error ("Wrong definition of DisabledModules");
 	return true;
     }
@@ -27,16 +27,25 @@
 
     y2milestone (
 	"Writing disabled modules %1 into %2",
-	ProductControl::DisabledModules,
+	ProductControl::GetDisabledModules(),
 	InstData::wizardsteps_disabled_modules
     );
 
-    if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_modules, ProductControl::DisabledModules) != true) {
+    if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_modules, ProductControl::GetDisabledModules()) != true) {
 	y2error ("Cannot write disabled modules");
-	return true;
     }
 
-    y2milestone ("Successful");
+    y2milestone (
+	"Writing disabled proposals %1 into %2",
+	ProductControl::GetDisabledProposals(),
+	InstData::wizardsteps_disabled_proposals
+    );
+
+    if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_proposals, ProductControl::GetDisabledProposals()) != true) {
+	y2error ("Cannot write disabled proposals");
+    }
+
+    y2milestone ("Anyway, successful");
 
     return true;
 }

Modified: trunk/installation/src/clients/inst_mode.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mode.ycp?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_mode.ycp (original)
+++ trunk/installation/src/clients/inst_mode.ycp Fri Mar 14 15:09:21 2008
@@ -171,6 +171,12 @@
 		    // check box
 		    _("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()
 		))
 	    ),
 	    `HStretch()
@@ -232,9 +238,7 @@
 string media = Linuxrc::InstallInf ("InstMode");
 y2milestone ("Umont result: %1, inst mode: %2", umount_result, media);
 
-// there are not only CD and DVD Add-On sources
-//if (umount_result != "0" && (media == "cd" || media == "dvd"))
-//    UI::ChangeWidget (`id (`add_on), `Enabled, false);
+other_options_disabled = false;
 
 // only installation (and addon products) enabled
 if (other_options_disabled) {
@@ -253,49 +257,56 @@
     }
 }
 
-// --> Handling User Input in Installation Mode
-
-ProductControl::DisabledModules = add (ProductControl::DisabledModules, "add-on");
-ProductControl::DisabledModules = add (ProductControl::DisabledModules, "inst_add-on");
-ProductControl::DisabledModules = add (ProductControl::DisabledModules, "productsources");
-ProductControl::DisabledModules = add (ProductControl::DisabledModules, "inst_productsources");
-UpdateWizardSteps();
+AdjustStepsAccordingToInstallationSettings();
 
-// Probably buggy UI, in case of two radio button groups, the second one
-// doesn't work (RadioButtonGroup (`id (`expert_options)))
 repeat {
     ret = (symbol) UI::UserInput();
     y2milestone("ret: %1", ret);
 
     // Use-Add-On-Product status changed
     if (ret == `add_on) {
-	if (UI::WidgetExists (`id (`add_on)))
+	if (UI::WidgetExists (`id (`add_on))) {
 	    Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
+	    y2milestone ("add_on_selected: %1", Installation::add_on_selected);
+	    AdjustStepsAccordingToInstallationSettings();
+	}
+	ret = nil;
+	continue;
+    }
+
+    // FIXME: this mode needs more RAM because it starts another YaST process.
+    // Warn user and/or disable the option if a machine has not enough memory.
+
+    // Use-Automatic-Configuration status changed
+    else if (ret == `use_automatic_configuration) {
+	if (UI::WidgetExists (`id (`use_automatic_configuration))) {
+	    ProductControl::SetUseAutomaticConfiguration ((boolean) UI::QueryWidget (`id (`use_automatic_configuration), `Value));
+	    y2milestone ("GetUseAutomaticConfiguration: %1", ProductControl::GetUseAutomaticConfiguration());
+	    AdjustStepsAccordingToInstallationSettings();
+	}
 	ret = nil;
 	continue;
     }
-    // Use Sources defined by product
+
+    // Use-Community-Repositories status changed
     else if (ret == `productsources) {
 	if (UI::WidgetExists (`id (`productsources))) {
 	    Installation::productsources_selected = (boolean) UI::QueryWidget (`id (`productsources), `Value);
+	    y2milestone ("productsources_selected: %1", Installation::productsources_selected);
+	    AdjustStepsAccordingToInstallationSettings();
 	}
 	ret = nil;
 	continue;
     }
+
     // Adjusting current UI - Other Options
     else if (ret == `repair) {
-	// Remembering add-on state, switching off and disabling
-	if (UI::WidgetExists (`id (`add_on))) {
-	    Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
-
-	    UI::ChangeWidget (`id(`add_on), `Value, false);
-	    UI::ChangeWidget (`id(`add_on), `Enabled, false);
-	}
-
-	if (UI::WidgetExists (`id (`productsources))) {
-	    UI::ChangeWidget (`id(`productsources), `Value, false);
-	    UI::ChangeWidget (`id(`productsources), `Enabled, false);
-	}
+	// disable all helper/options widgets 
+	foreach (any one_item, [`add_on, `productsources, `use_automatic_configuration], {
+	    if (UI::WidgetExists (`id (one_item))) {
+		UI::ChangeWidget (`id (one_item), `Enabled, false);
+	    }
+	});
 
 	ret = nil;
 	continue;
@@ -305,16 +316,16 @@
     else if (contains([`install, `update], ret)) {
 	symbol selected_mode = (symbol)  UI::QueryWidget (`id (`inst_mode), `CurrentButton);
 
-	// Enabling add-on, adjusting previous state (selected)
-	if (UI::WidgetExists (`id (`add_on))) {
-	    UI::ChangeWidget  (`id(`add_on), `Enabled, true);
-	    UI::ChangeWidget  (`id(`add_on), `Value, Installation::add_on_selected);
-	}
-
-	if (UI::WidgetExists (`id (`productsources))) {
-	    UI::ChangeWidget  (`id(`productsources), `Enabled, true);
-	    UI::ChangeWidget  (`id(`productsources), `Value, Installation::productsources_selected);
-	}
+	foreach (list one_item, [
+	    [`add_on, Installation::add_on_selected],
+	    [`productsources, Installation::add_on_selected],
+	    [`use_automatic_configuration, ProductControl::GetUseAutomaticConfiguration()],
+	], {
+	    if (UI::WidgetExists (`id (one_item[0]:`_item_not_defined))) {
+		UI::ChangeWidget  (`id (one_item[0]:`_item_not_defined), `Enabled, true);
+		UI::ChangeWidget  (`id (one_item[0]:`_item_not_defined), `Value, (boolean) one_item[1]:false);
+	    }
+	});
 
 	// Can be either `install or `update
 	UI::ChangeWidget  (`id(`inst_mode), `CurrentButton, selected_mode);
@@ -363,29 +374,7 @@
 
     if (new_mode == `install || new_mode == `update)
     {
-	Installation::add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
-	ProductControl::DisabledModules = filter (string m, ProductControl::DisabledModules, {
-	    return m != "add-on" && m != "inst_add-on";
-	});
-	if (! Installation::add_on_selected)
-	{
-	    ProductControl::DisabledModules = add (ProductControl::DisabledModules, "add-on");
-	    ProductControl::DisabledModules = add (ProductControl::DisabledModules, "inst_add-on");
-	}
-
-	if (UI::WidgetExists (`id (`productsources))) {
-	    Installation::productsources_selected = (boolean) UI::QueryWidget (`id (`productsources), `Value);
-	}
-	ProductControl::DisabledModules = filter (string m, ProductControl::DisabledModules, {
-	    return m != "productsources" && m != "inst_productsources";
-	});
-	if (! Installation::productsources_selected)
-	{
-	    ProductControl::DisabledModules = add (ProductControl::DisabledModules, "productsources");
-	    ProductControl::DisabledModules = add (ProductControl::DisabledModules, "inst_productsources");
-	}
-
-	y2milestone ("Disabled: %1", ProductControl::DisabledModules);
+	y2milestone ("Disabled modules: %1", ProductControl::GetDisabledModules());
     }
 
 } else if (ret == `back || ret == `finish) {

Modified: trunk/installation/src/clients/inst_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_proposal.ycp?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_proposal.ycp (original)
+++ trunk/installation/src/clients/inst_proposal.ycp Fri Mar 14 15:09:21 2008
@@ -1121,7 +1121,7 @@
     y2milestone( "Installation step #2" );
     proposal_mode = GetInstArgs::proposal();
 
-    if (contains (ProductControl::DisabledProposals, proposal_mode))
+    if (contains (ProductControl::GetDisabledProposals(), proposal_mode))
 	return `auto;
 
     proposal_properties = ProductControl::getProposalProperties(Stage::stage (), Mode::mode (), proposal_mode);

Modified: trunk/installation/src/clients/inst_suseconfig.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_suseconfig.ycp?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_suseconfig.ycp (original)
+++ trunk/installation/src/clients/inst_suseconfig.ycp Fri Mar 14 15:09:21 2008
@@ -33,6 +33,17 @@
     if ( GetInstArgs::going_back())	// going backwards?
 	return `auto;			// don't execute this once more
 
+    map param = $[];
+    if (size (WFM::Args()) > 0 && is (WFM::Args (0), map))
+	param = (map) WFM::Args (0);
+
+    boolean automatic_configuration = false;
+    if (param["AutomaticConfiguration"]:false == true) {
+	automatic_configuration = true;
+    }
+
+    y2milestone ("Script params: %1, AutoConf: %2", param, automatic_configuration);
+
     boolean reread_inittab = false;
 
     integer	current_step	= 0;	// Required by logStep()
@@ -52,8 +63,11 @@
      */
     define void logStep( string step_descr ) ``{
 	current_step = current_step + 1;
-	UI::ChangeWidget( `id(`progress), `Value, current_step );
-	UI::ChangeWidget( `id(`log), `LastLine, step_descr + "\n" );
+
+	if (! automatic_configuration) {
+	    UI::ChangeWidget( `id(`progress), `Value, current_step );
+	    UI::ChangeWidget( `id(`log), `LastLine, step_descr + "\n" );
+	}
     };
 
 
@@ -68,7 +82,9 @@
 	string command = sformat( "HOME=%1 %2 %3 2>&1", Directory::tmpdir, step, log_destination );
 	// Setting $HOME to Directory::tmpdir to avoid cluttering '/' with spurious files - bug #13204
 
-	if ( Mode::test () )
+	// automatic configuration doesn't have UI
+	// the very same approach uses testsuite
+	if (Mode::test () && ! automatic_configuration)
 	{
 	    y2milestone( "Test mode - NOT executing '%1'", command );
 	    sleep( 300 );
@@ -110,11 +126,13 @@
 
     // bugzilla #241553 comment #7
     UI::SetProductName ("");
-    Wizard::SetContents(
+    if (! automatic_configuration) {
+	Wizard::SetContents(
 			  // Dialog title for SuSEconfig dialog
 			  _("Writing the system configuration"),
 			  contents, help, GetInstArgs::enable_back(), GetInstArgs::enable_next());
-    Wizard::DisableAbortButton();
+	Wizard::DisableAbortButton();
+    }
 
 
     // --------------------------------------------------------------
@@ -153,7 +171,7 @@
 	    runStep( "/sbin/SuSEconfig --verbose --module "   + mod );
 	});
 
-	if ( ! Mode::test () )
+	if (! Mode::test () && ! automatic_configuration)
 	{
 	    SCR::Execute (.target.remove, "/var/lib/YaST2/run_suseconfig");
 	}
@@ -190,7 +208,7 @@
     UI::ChangeWidget( `id(`log), `LastLine, "\n" + _("Done.") + "\n" );
 
 
-    if ( Mode::test () )
+    if (Mode::test () && ! automatic_configuration)
     {
 	UI::MakeScreenShot();	// doesn't work manually - not widget with keyboard focus!
 	sleep( 5*1000 );

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=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_worker_continue.ycp (original)
+++ trunk/installation/src/clients/inst_worker_continue.ycp Fri Mar 14 15:09:21 2008
@@ -54,7 +54,7 @@
     // All stages
     SetUIContent();
 
-    AdjustDisabledModules();
+    AdjustDisabledItems();
 
     SetDiskActivationModule();
 

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=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_worker_initial.ycp (original)
+++ trunk/installation/src/clients/inst_worker_initial.ycp Fri Mar 14 15:09:21 2008
@@ -58,6 +58,7 @@
     InitFirstStageInstallationSystem();
 
     SetDiskActivationModule();
+    AdjustStepsAccordingToInstallationSettings();
 
     // Redraw steps before mouse is initialized
     // Bugzilla #296406
@@ -94,5 +95,7 @@
     // All Sources and Target need to be released...
     FinishInstallation (ret);
 
+    HandleSecondStageRequired();
+
     return ret;
 }

Modified: trunk/installation/src/clients/yast_inf_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/yast_inf_finish.ycp?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/clients/yast_inf_finish.ycp (original)
+++ trunk/installation/src/clients/yast_inf_finish.ycp Fri Mar 14 15:09:21 2008
@@ -89,17 +89,6 @@
     {
         InjectFile ("/etc/suse-blinux.conf");
     }
-
-    // --------------------------------------------------------------
-    // Tell new boot scripts to launch yast2, once the
-    // new system has done its virgin boot. The Write call
-    // creates any missing directory :-).
-
-    string runme_at_boot = Directory::vardir + "/runme_at_boot";
-    if (!SCR::Write (.target.string, runme_at_boot, ""))
-    {
-        y2error ("Couldn't create target %1", runme_at_boot );
-    }
 }
 else
 {

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=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/include/inst_inc_all.ycp (original)
+++ trunk/installation/src/include/inst_inc_all.ycp Fri Mar 14 15:09:21 2008
@@ -161,10 +161,10 @@
         // update the workflow according to current situation
         // disable disks activation if not needed
         boolean iscsi = Linuxrc::InstallInf("WithiSCSI") == "1";
+
         if (! (Arch::s390() || iscsi)) {
             y2milestone ("Disabling disk activation module");
-            ProductControl::DisabledModules = add (ProductControl::DisabledModules,
-                "disks_activate");
+            ProductControl::DisableModule ("disks_activate");
         }
     }
 

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=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/include/inst_inc_first.ycp (original)
+++ trunk/installation/src/include/inst_inc_first.ycp Fri Mar 14 15:09:21 2008
@@ -20,6 +20,7 @@
     import "Stage";
     import "FileUtils";
     import "String";
+    import "Mode";
 
     void InitMouse () {
         if (!Arch::s390 () || Arch::board_iseries ()) {
@@ -39,13 +40,13 @@
 	    Installation::encoding = "UTF-8";
 	}
 	
-	ProductControl::DisabledModules = add (ProductControl::DisabledModules, "add-on");
-	ProductControl::DisabledModules = add (ProductControl::DisabledModules, "productsources");
+	ProductControl::DisableModule ("add-on");
+	ProductControl::DisableModule  ("productsources");
 
 	// First-stage users module will enable them again only if needed
-	ProductControl::DisabledModules = add (ProductControl::DisabledModules, "root");
-	ProductControl::DisabledModules = add (ProductControl::DisabledModules, "user");
-	ProductControl::DisabledModules = add (ProductControl::DisabledModules, "auth");
+	ProductControl::DisableModule ("root");
+	ProductControl::DisableModule ("user");
+	ProductControl::DisableModule ("auth");
 
 	UI::SetLanguage (Language::language, Installation::encoding);
 	WFM::SetLanguage (Language::language, "UTF-8");
@@ -75,6 +76,7 @@
     void SetSystemUpdate () {
 	if (FileUtils::Exists (Installation::run_update_file)) {
 	    Mode::SetMode ("update");
+
 	    foreach (string m, [
 		"language", // language already selected
 		"disks_activate", // disks activated before running upgrade
@@ -83,9 +85,23 @@
 		"do_resize", // why is this included in upgrade at all? it is empty anyway
 		"prepdisk", // disks already mounted, it is dummy in update anyway
 	    ], {
-		ProductControl::DisabledModules = add (ProductControl::DisabledModules, m);
+		ProductControl::DisableModule (m);
 	    });
 	}
     }
 
+    void HandleSecondStageRequired () {
+	if (Mode::installation() && Stage::initial()) {
+	    string run_yast_at_boot = sformat ("%1/%2", Installation::destdir, Installation::run_yast_at_boot);
+
+	    if (ProductControl::RunRequired ("continue", "installation")) {
+		y2milestone ("Running the second stage is required");
+		WFM::Write (.local.string, run_yast_at_boot, "");
+	    } else {
+		y2milestone ("It is not required to run the second stage");
+		WFM::Execute (.local.remove, run_yast_at_boot);
+	    }
+	}
+    }
+
 } //end of include

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=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/include/inst_inc_second.ycp (original)
+++ trunk/installation/src/include/inst_inc_second.ycp Fri Mar 14 15:09:21 2008
@@ -47,8 +47,40 @@
 	    return;
 	}
 
-	ProductControl::DisabledModules = disabled_modules;
-	y2milestone ("Disabled modules set to %1", ProductControl::DisabledModules);
+	foreach (string one_module, disabled_modules, {
+	    ProductControl::DisableModule (one_module);
+	});
+
+	y2milestone ("Disabled modules set to %1", ProductControl::GetDisabledModules());
+    }
+
+    void AdjustDisabledProposals () {
+	if (InstData::wizardsteps_disabled_proposals == nil) {
+	    y2error ("Disabled proposals file not defined");
+	    return;
+	}
+
+	if (! FileUtils::Exists (InstData::wizardsteps_disabled_proposals)) {
+	    y2milestone ("File %1 doesn't exist, skipping...", InstData::wizardsteps_disabled_proposals);
+	    return;
+	}
+
+	list <string> disabled_proposals = (list <string>) SCR::Read (.target.ycp, InstData::wizardsteps_disabled_proposals);
+	if (disabled_proposals == nil) {
+	    y2error ("Error reading %1", InstData::wizardsteps_disabled_proposals);
+	    return;
+	}
+
+	foreach (string one_proposal, disabled_proposals, {
+	    ProductControl::DisableProposal (one_proposal);
+	});
+
+	y2milestone ("Disabled proposals set to %1", ProductControl::GetDisabledProposals());
+    }
+
+    void AdjustDisabledItems () {
+	AdjustDisabledModules();
+	AdjustDisabledProposals();
     }
 
     /**
@@ -388,8 +420,6 @@
 	    WorkflowManager::SetBaseWorkflow (false);
 	    WorkflowManager::MergeWorkflows();
 	    WorkflowManager::RedrawWizardSteps();
-        } else {
-            ProductControl::DisabledModules = add (ProductControl::DisabledModules, "add-on");
         }
     }
 

Modified: trunk/installation/src/include/misc.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.ycp?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/include/misc.ycp (original)
+++ trunk/installation/src/include/misc.ycp Fri Mar 14 15:09:21 2008
@@ -27,6 +27,7 @@
 import "Label";
 import "FileUtils";
 import "Linuxrc";
+import "InstData";
 
 /**
  * Function appends blacklisted modules to the /etc/modprobe.d/blacklist
@@ -207,4 +208,30 @@
 	return ( button == `confirm );
     }
 
+    void AdjustStepsAccordingToInstallationSettings () {
+        if (ProductControl::GetUseAutomaticConfiguration()) {
+            ProductControl::DisableAllModulesAndProposals ("installation", "continue");
+	} else {
+	    ProductControl::UnDisableAllModulesAndProposals ("installation", "continue");
+	}
+
+	if (Installation::add_on_selected == true) {
+	    ProductControl::EnableModule ("add-on");
+	} else {
+	    ProductControl::DisableModule ("add-on");
+	}
+
+	if (Installation::productsources_selected == true) {
+	    ProductControl::EnableModule ("productsources");
+	} else {
+	    ProductControl::DisableModule ("productsources");
+	}
+
+	y2milestone ("Disabled Modules: %1, Proposals: %2",
+	    ProductControl::GetDisabledModules(), ProductControl::GetDisabledProposals());
+
+        UpdateWizardSteps();
+    }
+
+
 } //end of include

Modified: trunk/installation/src/modules/InstData.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstData.ycp?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/src/modules/InstData.ycp (original)
+++ trunk/installation/src/modules/InstData.ycp Fri Mar 14 15:09:21 2008
@@ -42,6 +42,11 @@
     // keep steps disabled in first stage also disabled in second stage
     // see bnc #364066
     global string wizardsteps_disabled_modules = Directory::vardir + "/installation_disabled_steps";
+    global string wizardsteps_disabled_proposals = Directory::vardir + "/installation_disabled_proposals";
+
+    // temporary variables for disabling and enabling steps
+    global list <string> localDisabledModules = [];
+    global list <string> localDisabledProposals = [];
 
     // <-- other
 

Modified: trunk/installation/startup/YaST2.call
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/startup/YaST2.call (original)
+++ trunk/installation/startup/YaST2.call Fri Mar 14 15:09:21 2008
@@ -571,7 +571,6 @@
 # ---
 	if [ -f /var/lib/YaST2/reboot ];then
 		rm -f /var/lib/YaST2/reboot
-		touch /var/lib/YaST2/runme_at_boot
 		/sbin/shutdown -r now
 	fi
 }

Modified: trunk/installation/yast2-installation.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=45467&r1=45466&r2=45467&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Fri Mar 14 15:09:21 2008
@@ -10,7 +10,7 @@
 Requires:       autoyast2-installation
 
 # Installation::run_update_file
-Requires:	yast2 >= 2.16.27
+Requires:	yast2 >= 2.16.36
 
 # Required in in the first stage, after
 # switching to the installed system, bugzilla #249679

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r45467 - in /trunk/installation: ./ package/ src/clients/ src/include/ src/modules/ startup/

locilka＠svn.opensuse.org