Author: jsrain
Date: Mon Jul 12 13:56:35 2010
New Revision: 62222
URL: http://svn.opensuse.org/viewcvs/yast?rev=62222&view=rev
Log:
adjustments for autoupgrade
Added:
branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp
Modified:
branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am
branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp
branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp
branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp
Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am?rev=62222&r1=62221&r2=62222&view=diff
==============================================================================
--- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am (original)
+++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/Makefile.am Mon Jul 12 13:56:35 2010
@@ -13,6 +13,7 @@
inst_autoinit.ycp \
inst_autopost.ycp \
inst_autosetup.ycp \
+ inst_autosetup_upgrade.ycp \
report_auto.ycp \
scripts_auto.ycp \
software_auto.ycp \
Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp?rev=62222&r1=62221&r2=62222&view=diff
==============================================================================
--- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp (original)
+++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts1_finish.ycp Mon Jul 12 13:56:35 2010
@@ -42,7 +42,7 @@
"steps" : 1,
// progress step title
"title" : _("Executing autoinstall scripts in the installation environment..."),
- "when" : [ `autoinst ],
+ "when" : [ `autoinst, `autoupg ],
];
}
else if (func == "Write")
Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp?rev=62222&r1=62221&r2=62222&view=diff
==============================================================================
--- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp (original)
+++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/autoinst_scripts2_finish.ycp Mon Jul 12 13:56:35 2010
@@ -40,7 +40,7 @@
"steps" : 1,
// progress step title
"title" : _("Executing autoinstall scripts in the installation environment..."),
- "when" : [ `autoinst ],
+ "when" : [ `autoinst, `autoupg ],
];
}
else if (func == "Write")
Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp?rev=62222&r1=62221&r2=62222&view=diff
==============================================================================
--- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp (original)
+++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autoinit.ycp Mon Jul 12 13:56:35 2010
@@ -23,6 +23,7 @@
// import "Arch";
import "Call";
import "Console";
+ import "Mode";
import "Popup";
@@ -165,10 +166,21 @@
}
Progress::Title(_("Probing hardware..."));
- WFM::CallFunction("inst_system_analysis", [] );
+ if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart))
+ WFM::CallFunction("inst_system_analysis", [] );
AutoInstallRules::ProbeRules();
if( ! profileFetched ) {
+
+
+ // if profile is defined, first read it, then probe hardware
+ any autoinstall = SCR::Read(.etc.install_inf.AutoYaST);
+ if (Mode::autoupgrade() && ! (autoinstall != nil && is ( autoinstall , string ) && (string)autoinstall != ""))
+ {
+ AutoinstConfig::ParseCmdLine("file:///mnt/autoupg.xml");
+ AutoinstConfig::ProfileInRootPart = true;
+ }
+
symbol ret = processProfile();
if( ret != `ok ) {
return ret;
Added: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp?rev=62222&view=auto
==============================================================================
--- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp (added)
+++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp Mon Jul 12 13:56:35 2010
@@ -0,0 +1,421 @@
+/**
+ * File: clients/inst_autosetup.ycp
+ * Package: Auto-installation
+ * Summary: Setup and prepare system for auto-installation
+ * Authors: Anas Nashif
+ * Uwe Gansert
+ *
+ * $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
+ */
+
+{
+ textdomain "autoinst";
+
+ import "AutoinstConfig";
+ import "AutoInstall";
+ import "Installation";
+ import "Profile";
+ import "Progress";
+ import "Report";
+ import "AutoinstStorage";
+ import "AutoinstScripts";
+ import "AutoinstGeneral";
+ import "AutoinstSoftware";
+ import "Bootloader";
+ import "BootCommon";
+ import "Popup";
+ import "RunlevelEd";
+ import "Arch";
+ import "AutoinstLVM";
+ import "AutoinstRAID";
+ import "Storage";
+ import "Timezone";
+ import "Keyboard";
+ import "Call";
+ import "ProductControl";
+ import "LanUdevAuto";
+ import "Language";
+ import "Console";
+
+ include "bootloader/routines/autoinstall.ycp";
+ include "autoinstall/ask.ycp";
+
+ define symbol readModified() {
+ if (SCR::Read(.target.size, AutoinstConfig::modified_profile) > 0 ) {
+ if (! Profile::ReadXML( AutoinstConfig::modified_profile ) || Profile::current == $[] ) {
+ Popup::Error(_("Error while parsing the control file.
+Check the log files for more details or fix the
+control file and try again.
+"));
+ return `abort;
+ }
+ string cpcmd = sformat("mv %1 %2","/tmp/profile/autoinst.xml", "/tmp/profile/pre-autoinst.xml");
+ y2milestone("copy original profile: %1",cpcmd);
+ SCR::Execute(.target.bash, cpcmd);
+
+ cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, "/tmp/profile/autoinst.xml");
+ y2milestone("moving modified profile: %1",cpcmd);
+ SCR::Execute(.target.bash, cpcmd);
+ return `found;
+ }
+ return `not_found;
+ }
+
+ string help_text = _("<P>Please wait while the system is prepared for autoinstallation.</P>");
+ list<string> progress_stages =
+ [
+ _("Configure General Settings "),
+ _("Execute pre-install user scripts"),
+ _("Set up language"),
+ _("Configure Software selections"),
+ ];
+
+ list<string> progress_descriptions =
+ [
+ _("Configuring general settings..."),
+ _("Executing pre-install user scripts..."),
+ _("Configuring Software selections...")
+ ];
+
+ Progress::New(
+ _("Preparing System for Automated Installation"),
+ "", // progress_title
+ size( progress_stages ), // progress bar length
+ progress_stages,
+ progress_descriptions,
+ help_text );
+
+
+ if(UI::PollInput() == `abort)
+ if (Popup::ConfirmAbort (`painless))
+ return `abort;
+ Progress::NextStage();
+
+
+ // configure general settings
+
+
+
+
+
+ if(UI::PollInput() == `abort)
+ if (Popup::ConfirmAbort (`painless))
+ return `abort;
+
+ Progress::NextStage();
+
+ // Pre-Scripts
+ AutoinstScripts::Import(Profile::current["scripts"]:$[]);
+ AutoinstScripts::Write("pre-scripts", false);
+
+ // Reread Profile in case it was modified in pre-script
+ // User has to create the new profile in a pre-defined
+ // location for easy processing in pre-script.
+
+ if( readModified() == `abort )
+ return `abort;
+
+ //
+ // Partitioning and Storage
+ ////////////////////////////////////////////////////////////////////////
+
+ boolean modified = true;
+ do {
+ askDialog();
+ // Pre-Scripts
+ AutoinstScripts::Import(Profile::current["scripts"]:$[]);
+ AutoinstScripts::Write("pre-scripts", false);
+ symbol ret = readModified();
+ if( ret == `abort )
+ return `abort;
+ if( ret == `not_found )
+ modified = false;
+ } while( modified == true );
+
+ // reimport scripts, for the case <ask> has changed them
+ AutoinstScripts::Import(Profile::current["scripts"]:$[]);
+ //
+ // Set Mouse and other workflow variables
+ //
+ AutoinstGeneral::Import(Profile::current["general"]:$[]);
+ y2milestone("general: %1", Profile::current["general"]:$[] );
+ AutoinstGeneral::Write();
+
+ if( haskey( Profile::current, "add-on" ) ) {
+ Call::Function("add-on_auto", ["Import", Profile::current["add-on"]:$[]] );
+ Call::Function("add-on_auto", ["Write"]);
+ }
+
+ boolean use_utf8 = true; // utf8 is default
+
+ map displayinfo = UI::GetDisplayInfo();
+ if ( ! displayinfo["HasFullUtf8Support"]:true )
+ {
+ use_utf8 = false; // fallback to ascii
+ }
+
+
+ //
+ // Set it in the Language module.
+ //
+ Progress::NextStep();
+ Progress::Title(_("Configuring language..."));
+ Language::Import( Profile::current["language"]:$[] );
+
+ //
+ // Set Console font
+ //
+ Installation::encoding = Console::SelectFont( Language::language );
+
+ if (displayinfo["HasFullUtf8Support"]:true)
+ {
+ Installation::encoding = "UTF-8";
+ }
+
+ UI::SetLanguage (Language::language, Installation::encoding);
+ WFM::SetLanguage (Language::language, "UTF-8");
+
+ if( haskey( Profile::current, "timezone" ) )
+ Timezone::Import(Profile::current["timezone"]:$[]);
+ if( haskey( Profile::current, "keyboard" ) )
+ Keyboard::Import(Profile::current["keyboard"]:$[]);
+
+
+ // one can override the <confirm> option by the commandline parameter y2confirm
+ string tmp = (string)SCR::Read (.target.string, "/proc/cmdline");
+ if (tmp != nil && contains (splitstring (tmp, " \n"), "y2confirm")) {
+ AutoinstConfig::Confirm = true;
+ y2milestone("y2confirm found and confirm turned on");
+ }
+
+
+ if(UI::PollInput() == `abort)
+ if (Popup::ConfirmAbort (`painless))
+ return `abort;
+
+ // moved here from autoinit for fate #301193
+ // needs testing
+ if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
+ y2milestone("arch=s390 and remote_profile=true");
+ if( haskey(Profile::current, "dasd") ) {
+ y2milestone("dasd found");
+ Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
+ }
+ if( haskey(Profile::current, "zfcp") ) {
+ y2milestone("zfcp found");
+ Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
+ }
+ }
+
+ Progress::NextStage();
+
+ Storage::ReReadTargetMap();
+
+ if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart)) {
+ if (`abort == WFM::CallFunction("inst_update_partition_auto", []))
+ return `abort;
+ }
+
+
+ // Software
+
+ if(UI::PollInput() == `abort)
+ if (Popup::ConfirmAbort (`painless))
+ return `abort;
+
+
+ Progress::NextStage();
+
+ // initialize package manager
+ import "Packages";
+ import "PackageCallbacks";
+ import "Update";
+ import "RootPart";
+ import "ProductFeatures";
+ import "Product";
+
+// FIXME FIXME FIXME copy-paste from update_proposal
+ map GetUpdateConf () {
+ // 'nil' values are skipped, in that case, ZYPP uses own default values
+ map ret = $[];
+
+// not supported by libzypp anymore
+// if (Update::deleteOldPackages != nil) {
+// ret["delete_unmaintained"] = Update::deleteOldPackages;
+// }
+
+ if (Update::silentlyDowngradePackages != nil) {
+ ret["silent_downgrades"] = Update::silentlyDowngradePackages;
+ }
+
+ y2milestone ("Using update configuration: %1", ret);
+
+ return ret;
+ }
+
+ Packages::Init(true);
+
+ // initialize target
+ if (true)
+ {
+ PackageCallbacks::SetConvertDBCallbacks ();
+
+ Pkg::TargetInit (Installation::destdir, false);
+
+ Update::GetProductName ();
+ }
+
+ // FATE #301990, Bugzilla #238488
+ // Set initial update-related (packages/patches) values from control file
+ Update::InitUpdate();
+
+ // some products are listed in media control file and at least one is compatible
+ // with system just being updated
+ boolean update_not_possible = false;
+
+ // FATE #301844
+ y2milestone ("Previous '%1', New '%2' RootPart",
+ RootPart::previousRootPartition, RootPart::selectedRootPartition);
+ if (RootPart::previousRootPartition != RootPart::selectedRootPartition) {
+ RootPart::previousRootPartition = RootPart::selectedRootPartition;
+
+ // check whether update is possible
+ // reset deleteOldPackages and onlyUpdateInstalled in respect to the selected system
+ Update::Reset();
+ if (! Update::IsProductSupportedForUpgrade()) {
+ y2milestone ("Upgrade is not supported");
+ update_not_possible = true;
+ }
+ }
+
+ // connect target with package manager
+ if (!Update::did_init1)
+ {
+ Update::did_init1 = true;
+
+ if (size (Pkg::ResolvableProperties ("", `pattern, "")) > 0)
+ {
+ y2milestone ("No base selection found, but patterns found...");
+ Packages::using_patterns = true;
+ }
+
+ list<string> restore = [];
+ list > selected = Pkg::ResolvableProperties ("", `product, "");
+ foreach (map s, selected, {
+ restore = add (restore, s["name"]:"");
+ });
+
+ Pkg::PkgApplReset ();
+
+ // bnc #300540
+ // bnc #391785
+ // Drops packages after PkgApplReset, not before (that would null that)
+ Update::DropObsoletePackages();
+
+ foreach (string res, restore, {
+ Pkg::ResolvableInstall (res, `product);
+ });
+ if (! Update::onlyUpdateInstalled)
+ {
+ if (Packages::using_patterns)
+ {
+ Update::SetDesktopPattern ();
+ }
+ else
+ {
+ Update::ProposeSelection ();
+ }
+ }
+
+ if (Update::onlyUpdateInstalled) // just consider already installed packages
+ {
+ Pkg::SetSelection (""); // -> don't select any additional selections
+ }
+ else if (Packages::using_patterns)
+ {
+ if (! ProductFeatures::GetBooleanFeature ("software",
+ "only_update_installed"))
+ {
+ foreach (string pat, Product::patterns, {
+ y2milestone("Pre-select pattern %1", pat);
+ Pkg::ResolvableInstall( pat, `pattern );
+ });
+ }
+
+ }
+ else // update selections too
+ {
+ Pkg::SetSelection (Update::selected_selection); // -> set the base selection (minimal, default, ....)
+
+ if (!Update::manual_interaction)
+ {
+ // now compare installed (old) selections against available (new) selections
+ // and set all selections which are installed (old) and available (new)
+ // as 'to be installed' -> UI will show "to be updated" for these selections
+
+ list<string> available_addons = Pkg::GetSelections (`available, "");
+ list<string> installed_addons = Pkg::GetSelections (`installed, "");
+
+ foreach (string installed, installed_addons,
+ {
+ if (contains (available_addons, installed)) // we have a newer selection for an installed one
+ {
+ Pkg::SetSelection (installed); // update this selection too (selection solving included)
+ }
+ });
+ }
+ }
+
+ Packages::SelectProduct();
+ Pkg::ActivateSelections (); // now go through all selected selections and select their packages
+ // bnc #382208
+
+ // bnc#582702 - do not select kernel on update, leave that on dependencies like 'zypper dup'
+ // therefore commented line below out
+// Packages::SelectKernelPackages ();
+
+ // FATE #301990, Bugzilla #238488
+ // Control the upgrade process better
+ map update_sum
+ = Pkg::PkgUpdateAll (GetUpdateConf());
+ y2milestone ("Update summary: %1", update_sum);
+ Update::unknown_packages = update_sum[`ProblemListSze]:0;
+
+ list<string> sys_patterns = Packages::ComputeSystemPatternList ();
+ foreach (string pat, sys_patterns, {
+ Pkg::ResolvableInstall (pat, `pattern);
+ });
+ // this is new, (de)select stuff from the profile
+ list<string> packages = Profile::current["software","packages"]:[];
+ list<string> patterns = Profile::current["software","patterns"]:[];
+ list<string> remove_packages = Profile::current["software","remove-packages"]:[];
+ list<string> remove_patterns = Profile::current["software","remove-patterns"]:[];
+ foreach (string p, remove_patterns, {
+ Pkg::ResolvableRemove (p, `pattern);
+ });
+ foreach (string p, remove_packages, {
+ Pkg::ResolvableRemove (p, `package);
+ });
+ foreach (string p, patterns, {
+ Pkg::ResolvableInstall (p, `pattern);
+ });
+ foreach (string p, packages, {
+ Pkg::ResolvableInstall (p, `package);
+ });
+ // old stuff again here
+ if (Pkg::PkgSolve (!Update::onlyUpdateInstalled))
+ Update::solve_errors = 0;
+ else
+ Update::solve_errors = Pkg::PkgSolveErrors ();
+
+ }
+
+
+ AutoInstall::TurnOff();
+ Progress::Finish();
+
+ symbol ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true);
+ if (ret == `next)
+ return `finish;
+ return ret;
+}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
