Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at Mon Jan 24 16:07:05 CET 2011.
--------
--- autoyast2/autoyast2.changes 2011-01-04 12:11:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2011-01-19 15:22:42.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 19 15:15:20 CET 2011 - jsrain@suse.cz
+
+- adaptations for unattended migration (fate#310481)
+- 2.20.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
autoyast2-2.20.3.tar.bz2
New:
----
autoyast2-2.20.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.vQrGbo/_old 2011-01-24 16:06:53.000000000 +0100
+++ /var/tmp/diff_new_pack.vQrGbo/_new 2011-01-24 16:06:53.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.20.3)
+# spec file for package autoyast2
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: autoyast2
-Version: 2.20.3
+Version: 2.20.4
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.20.3.tar.bz2
+Source0: autoyast2-2.20.4.tar.bz2
Prefix: /usr
@@ -65,7 +65,7 @@
%package installation
License: GPLv2+
-Version: 2.20.3
+Version: 2.20.4
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -82,7 +82,7 @@
generated with the autoyast2 package.
%prep
-%setup -n autoyast2-2.20.3
+%setup -n autoyast2-2.20.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -241,6 +241,9 @@
/usr/share/YaST2/clients/autoinst_scripts1_finish.ycp
/usr/share/YaST2/clients/autoinst_scripts2_finish.ycp
/usr/share/YaST2/clients/ayast_probe.ycp
+/usr/share/YaST2/clients/inst_autosetup_upgrade.ycp
+/usr/share/YaST2/clients/inst_store_upgrade_software.ycp
+
/usr/share/YaST2/include/autoinstall/xml.ycp
/usr/share/YaST2/include/autoinstall/ask.ycp
++++++ autoyast2-2.20.3.tar.bz2 -> autoyast2-2.20.4.tar.bz2 ++++++
++++ 4085 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.3/VERSION new/autoyast2-2.20.4/VERSION
--- old/autoyast2-2.20.3/VERSION 2011-01-04 12:04:27.000000000 +0100
+++ new/autoyast2-2.20.4/VERSION 2011-01-19 15:15:35.000000000 +0100
@@ -1 +1 @@
-2.20.3
+2.20.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.3/configure.in new/autoyast2-2.20.4/configure.in
--- old/autoyast2-2.20.3/configure.in 2011-01-04 12:06:12.000000000 +0100
+++ new/autoyast2-2.20.4/configure.in 2011-01-19 15:22:18.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.20.3, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.20.4, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.3"
+VERSION="2.20.4"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.3/src/clients/Makefile.am new/autoyast2-2.20.4/src/clients/Makefile.am
--- old/autoyast2-2.20.3/src/clients/Makefile.am 2010-10-12 17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/Makefile.am 2011-01-19 15:16:36.000000000 +0100
@@ -1,7 +1,7 @@
#
# Makefile.am for y2c_autoinst/src
#
-# $Id: Makefile.am 35221 2007-01-11 11:40:16Z ug $
+# $Id: Makefile.am 63230 2011-01-19 14:16:35Z jsrain $
#
client_DATA = \
autoyast.ycp \
@@ -13,6 +13,8 @@
inst_autoinit.ycp \
inst_autopost.ycp \
inst_autosetup.ycp \
+ inst_autosetup_upgrade.ycp \
+ inst_store_upgrade_software.ycp \
report_auto.ycp \
scripts_auto.ycp \
software_auto.ycp \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.3/src/clients/autoinst_scripts1_finish.ycp new/autoyast2-2.20.4/src/clients/autoinst_scripts1_finish.ycp
--- old/autoyast2-2.20.3/src/clients/autoinst_scripts1_finish.ycp 2010-10-12 17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/autoinst_scripts1_finish.ycp 2011-01-19 15:16:36.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: autoinst_scripts1_finish.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: autoinst_scripts1_finish.ycp 63230 2011-01-19 14:16:35Z jsrain $
*
*/
@@ -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")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.3/src/clients/autoinst_scripts2_finish.ycp new/autoyast2-2.20.4/src/clients/autoinst_scripts2_finish.ycp
--- old/autoyast2-2.20.3/src/clients/autoinst_scripts2_finish.ycp 2010-10-12 17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/autoinst_scripts2_finish.ycp 2011-01-19 15:16:36.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: autoinst_scripts2_finish.ycp 47536 2008-05-14 14:28:48Z ug $
+ * $Id: autoinst_scripts2_finish.ycp 63230 2011-01-19 14:16:35Z jsrain $
*
*/
@@ -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")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.3/src/clients/inst_autoconfigure.ycp new/autoyast2-2.20.4/src/clients/inst_autoconfigure.ycp
--- old/autoyast2-2.20.3/src/clients/inst_autoconfigure.ycp 2010-10-12 17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/inst_autoconfigure.ycp 2011-01-19 15:16:36.000000000 +0100
@@ -5,7 +5,7 @@
* Summary: This module finishes auto-installation and configures
* the system as described in the profile file.
*
- * $Id: inst_autoconfigure.ycp 62444 2010-08-30 11:06:41Z ug $
+ * $Id: inst_autoconfigure.ycp 63230 2011-01-19 14:16:35Z jsrain $
*/
{
@@ -112,10 +112,13 @@
y2milestone("Order: %1", maplist(map d, deps, ``(d["res"]:"")));
- if (!haskey(Profile::current , "networking") ) {
- removeNetwork(); // no networking section -> no network
- } else if( Profile::current["networking","keep_install_network"]:false == false ) {
- removeNetwork(); // networking section without keeping the install network
+ // keep network on AutoYaST ugprade
+ if (! Mode::autoupgrade()) {
+ if (!haskey(Profile::current , "networking") ) {
+ removeNetwork(); // no networking section -> no network
+ } else if( Profile::current["networking","keep_install_network"]:false == false ) {
+ removeNetwork(); // networking section without keeping the install network
+ }
}
foreach(map r, deps,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.3/src/clients/inst_autoinit.ycp new/autoyast2-2.20.4/src/clients/inst_autoinit.ycp
--- old/autoyast2-2.20.3/src/clients/inst_autoinit.ycp 2010-10-12 17:03:24.000000000 +0200
+++ new/autoyast2-2.20.4/src/clients/inst_autoinit.ycp 2011-01-19 15:16:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Parses XML Profile for automatic installation
* Authors: Anas Nashif
*
- * $Id: inst_autoinit.ycp 53201 2008-11-12 13:21:33Z ug $
+ * $Id: inst_autoinit.ycp 63230 2011-01-19 14:16:35Z jsrain $
*
*/
@@ -23,6 +23,7 @@
// import "Arch";
import "Call";
import "Console";
+ import "Mode";
import "Popup";
@@ -165,10 +166,22 @@
}
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/root/autoupg.xml");
+ AutoinstConfig::ProfileInRootPart = true;
+ }
+
symbol ret = processProfile();
if( ret != `ok ) {
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.3/src/clients/inst_autosetup_upgrade.ycp new/autoyast2-2.20.4/src/clients/inst_autosetup_upgrade.ycp
--- old/autoyast2-2.20.3/src/clients/inst_autosetup_upgrade.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/autoyast2-2.20.4/src/clients/inst_autosetup_upgrade.ycp 2011-01-18 14:20:36.000000000 +0100
@@ -0,0 +1,434 @@
+/**
+ * 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;
+ }
+ }
+
+ // this is new - override the default upgrade mode
+ if (Profile::current["upgrade","only_installed_packages"]:nil != nil)
+ Update::onlyUpdateInstalled = Profile::current["upgrade","only_installed_packages"]: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