Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Mon Jan 24 15:18:22 CET 2011.
--------
--- yast2-installation/yast2-installation.changes 2010-11-18 16:18:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2011-01-20 14:24:09.000000000 +0100
@@ -1,0 +2,31 @@
+Thu Jan 20 14:18:41 CET 2011 - jsrain@suse.cz
+
+- fix initialization of AutoUpgrade for 2nd stage
+- 2.20.4
+
+-------------------------------------------------------------------
+Wed Jan 19 15:38:20 CET 2011 - jsrain@suse.cz
+
+- adaptations for unattended migration (fate#310481)
+- don't delete /etc/mtab if it is a symlink (bnc#665437)
+- 2.20.3
+
+-------------------------------------------------------------------
+Wed Jan 19 12:53:00 CET 2011 - jsrain@suse.cz
+
+- fixed progress during live installation (bnc#665413)
+- 2.20.2
+
+-------------------------------------------------------------------
+Fri Jan 7 13:43:01 CET 2011 - jsrain@suse.cz
+
+- update XFCE desktop definition
+
+-------------------------------------------------------------------
+Thu Jan 6 10:47:00 CET 2011 - locilka@suse.cz
+
+- Using wider space for licence displayed in non-textual interface
+ (BNC #607135).
+- Fixed DUD deployment (BNC #626337)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.20.1.tar.bz2
New:
----
yast2-installation-2.20.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.9RYwMS/_old 2011-01-24 15:14:44.000000000 +0100
+++ /var/tmp/diff_new_pack.9RYwMS/_new 2011-01-24 15:14:44.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-installation (Version 2.20.1)
+# spec file for package yast2-installation
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Name: yast2-installation
-Version: 2.20.1
+Version: 2.20.4
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.20.1.tar.bz2
+Source0: yast2-installation-2.20.4.tar.bz2
Prefix: /usr
@@ -136,7 +136,7 @@
System installation code as present on installation media.
%prep
-%setup -n yast2-installation-2.20.1
+%setup -n yast2-installation-2.20.4
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-installation-2.20.1.tar.bz2 -> yast2-installation-2.20.4.tar.bz2 ++++++
++++ 4050 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/yast2-installation-2.20.1/VERSION new/yast2-installation-2.20.4/VERSION
--- old/yast2-installation-2.20.1/VERSION 2010-11-18 17:14:00.000000000 +0100
+++ new/yast2-installation-2.20.4/VERSION 2011-01-20 14:20:57.000000000 +0100
@@ -1 +1 @@
-2.20.1
+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/yast2-installation-2.20.1/configure.in new/yast2-installation-2.20.4/configure.in
--- old/yast2-installation-2.20.1/configure.in 2010-11-18 17:17:14.000000000 +0100
+++ new/yast2-installation-2.20.4/configure.in 2011-01-20 14:22:42.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(yast2-installation, 2.20.1, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.20.4, http://bugs.opensuse.org/, yast2-installation)
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.1"
+VERSION="2.20.4"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
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/yast2-installation-2.20.1/control/control.SLED.xml new/yast2-installation-2.20.4/control/control.SLED.xml
--- old/yast2-installation-2.20.1/control/control.SLED.xml 2010-08-18 13:49:45.000000000 +0200
+++ new/yast2-installation-2.20.4/control/control.SLED.xml 2011-01-18 15:09:41.000000000 +0100
@@ -483,7 +483,7 @@
<proposal>
<label>Installation Settings</label>
- <mode>update</mode>
+ <mode>update,autoupgrade</mode>
<stage>initial</stage>
<name>initial</name>
update_initial
@@ -1307,6 +1307,94 @@
<workflow>
<defaults>
<archs>all</archs>
+ </defaults>
+ <label>Preparation</label>
+ <mode>autoupgrade</mode>
+ <stage>initial</stage>
+ <modules config:type="list">
+ <module>
+ <label>System Analysis</label>
+ <name>system_analysis</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>System for Update</label>
+ <name>update_partition_auto</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autoinit</name>
+ <archs>all</archs>
+ <retranslate config:type="boolean">true</retranslate>
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autosetup_upgrade</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Update</label>
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>initial_update_proposal</name>
+ <execute>inst_proposal</execute>
+ <proposal>initial</proposal>
+ no
+ yes
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>bl_preupdate</name>
+ <execute>bootloader_preupdate</execute>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>prepareprogress</name>
+ </module>
+
+ <module>
+ <label>Perform Update</label>
+ <name>do_resize</name>
+ <update config:type="boolean">false</update>
+ <archs>i386,x86_64,ia64</archs>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>prepdisk</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>kickoff</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>store_upgrade_software</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy</name>
+ </module>
+ <module>
+ <!-- FATE #304940: s390 reIPL -->
+ <label>Perform Update</label>
+ <name>reiplauto</name>
+ <archs>s390</archs>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>finish</name>
+ </module>
+ </modules>
+ </workflow>
+
+
+ <workflow>
+ <defaults>
+ <archs>all</archs>
no
no
</defaults>
@@ -1339,5 +1427,38 @@
</modules>
</workflow>
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ no
+ no
+ </defaults>
+ <stage>continue</stage>
+ <mode>autoupgrade</mode>
+ <modules config:type="list">
+ <module>
+ <label>Perform Update</label>
+ <name>autopost</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy_secondstage</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>System Configuration</label>
+ <name>autoconfigure</name>
+ </module>
+ <module>
+ <label>Clean Up</label>
+ <name>suseconfig</name>
+ </module>
+ </modules>
+ </workflow>
+
+
</workflows>
</productDefines>
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/yast2-installation-2.20.1/control/control.SLES.xml new/yast2-installation-2.20.4/control/control.SLES.xml
--- old/yast2-installation-2.20.1/control/control.SLES.xml 2010-08-18 13:49:45.000000000 +0200
+++ new/yast2-installation-2.20.4/control/control.SLES.xml 2011-01-18 15:09:24.000000000 +0100
@@ -538,7 +538,7 @@
<proposal>
<label>Installation Settings</label>
- <mode>update</mode>
+ <mode>update,autoupgrade</mode>
<stage>initial</stage>
<name>initial</name>
update_initial
@@ -559,7 +559,7 @@
<proposal>
<archs>s390</archs>
<label>Installation Settings</label>
- <mode>update</mode>
+ <mode>update,autoupgrade</mode>
<stage>initial</stage>
<name>initial</name>
update_S390_initial
@@ -1491,6 +1491,94 @@
<workflow>
<defaults>
<archs>all</archs>
+ </defaults>
+ <label>Preparation</label>
+ <mode>autoupgrade</mode>
+ <stage>initial</stage>
+ <modules config:type="list">
+ <module>
+ <label>System Analysis</label>
+ <name>system_analysis</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>System for Update</label>
+ <name>update_partition_auto</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autoinit</name>
+ <archs>all</archs>
+ <retranslate config:type="boolean">true</retranslate>
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autosetup_upgrade</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Update</label>
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>initial_update_proposal</name>
+ <execute>inst_proposal</execute>
+ <proposal>initial</proposal>
+ no
+ yes
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>bl_preupdate</name>
+ <execute>bootloader_preupdate</execute>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>prepareprogress</name>
+ </module>
+
+ <module>
+ <label>Perform Update</label>
+ <name>do_resize</name>
+ <update config:type="boolean">false</update>
+ <archs>i386,x86_64,ia64</archs>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>prepdisk</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>kickoff</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>store_upgrade_software</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy</name>
+ </module>
+ <module>
+ <!-- FATE #304940: s390 reIPL -->
+ <label>Perform Update</label>
+ <name>reiplauto</name>
+ <archs>s390</archs>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>finish</name>
+ </module>
+ </modules>
+ </workflow>
+
+
+ <workflow>
+ <defaults>
+ <archs>all</archs>
no
no
</defaults>
@@ -1524,6 +1612,39 @@
</modules>
</workflow>
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ no
+ no
+ </defaults>
+ <stage>continue</stage>
+ <mode>autoupgrade</mode>
+ <modules config:type="list">
+ <module>
+ <label>Perform Update</label>
+ <name>autopost</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy_secondstage</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>System Configuration</label>
+ <name>autoconfigure</name>
+ </module>
+ <module>
+ <label>Clean Up</label>
+ <name>suseconfig</name>
+ </module>
+ </modules>
+ </workflow>
+
+
</workflows>
</productDefines>
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/yast2-installation-2.20.1/control/control.openSUSE.xml new/yast2-installation-2.20.4/control/control.openSUSE.xml
--- old/yast2-installation-2.20.1/control/control.openSUSE.xml 2010-09-03 08:22:02.000000000 +0200
+++ new/yast2-installation-2.20.4/control/control.openSUSE.xml 2011-01-18 15:09:58.000000000 +0100
@@ -236,6 +236,16 @@
<priority config:type="integer">99</priority>
+ <baseurl>http://download.opensuse.org/debug/update/11.4/</baseurl>
+ <alias>repo-debug-update</alias>
+ <name>openSUSE-11.4-Update-Debug</name>
+ /
+ <enabled config:type="boolean">false</enabled>
+ <autorefresh config:type="boolean">true</autorefresh>
+ <priority config:type="integer">99</priority>
+
+
+
<baseurl>http://download.opensuse.org/source/distribution/11.4/repo/oss/</baseurl>
<alias>repo-source</alias>
<name>openSUSE-11.4-Source</name>
@@ -278,9 +288,9 @@
<name>xfce</name>
<desktop>startxfce4</desktop>
desktop_xfce
- <logon>xdm</logon>
+ <logon>gdm</logon>
<cursor>DMZ</cursor>
- <packages>xfce4-desktop</packages>
+ <packages>xfce4-session</packages>
<order config:type="integer">4</order>
<patterns>xfce x11 base</patterns>
<icon>pattern-xfce</icon>
@@ -319,7 +329,7 @@
<cursor>DMZ</cursor>
<packages>xorg-x11</packages>
<order config:type="integer">8</order>
- <patterns>enhanced_base</patterns>
+ <patterns>base</patterns>
<icon>yast-sshd</icon>
@@ -535,7 +545,7 @@
<proposal>
<label>Installation Settings</label>
- <mode>update</mode>
+ <mode>update,autoupgrade</mode>
<stage>initial</stage>
<name>initial</name>
update_initial
@@ -1389,6 +1399,94 @@
<workflow>
<defaults>
<archs>all</archs>
+ </defaults>
+ <label>Preparation</label>
+ <mode>autoupgrade</mode>
+ <stage>initial</stage>
+ <modules config:type="list">
+ <module>
+ <label>System Analysis</label>
+ <name>system_analysis</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>System for Update</label>
+ <name>update_partition_auto</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autoinit</name>
+ <archs>all</archs>
+ <retranslate config:type="boolean">true</retranslate>
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autosetup_upgrade</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Update</label>
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>initial_update_proposal</name>
+ <execute>inst_proposal</execute>
+ <proposal>initial</proposal>
+ no
+ yes
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>bl_preupdate</name>
+ <execute>bootloader_preupdate</execute>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>prepareprogress</name>
+ </module>
+
+ <module>
+ <label>Perform Update</label>
+ <name>do_resize</name>
+ <update config:type="boolean">false</update>
+ <archs>i386,x86_64,ia64</archs>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>prepdisk</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>kickoff</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>store_upgrade_software</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy</name>
+ </module>
+ <module>
+ <!-- FATE #304940: s390 reIPL -->
+ <label>Perform Update</label>
+ <name>reiplauto</name>
+ <archs>s390</archs>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>finish</name>
+ </module>
+ </modules>
+ </workflow>
+
+
+ <workflow>
+ <defaults>
+ <archs>all</archs>
no
no
</defaults>
@@ -1421,5 +1519,38 @@
</modules>
</workflow>
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ no
+ no
+ </defaults>
+ <stage>continue</stage>
+ <mode>autoupgrade</mode>
+ <modules config:type="list">
+ <module>
+ <label>Perform Update</label>
+ <name>autopost</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy_secondstage</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>System Configuration</label>
+ <name>autoconfigure</name>
+ </module>
+ <module>
+ <label>Clean Up</label>
+ <name>suseconfig</name>
+ </module>
+ </modules>
+ </workflow>
+
+
</workflows>
</productDefines>
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/yast2-installation-2.20.1/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.20.4/src/clients/inst_complex_welcome.ycp
--- old/yast2-installation-2.20.1/src/clients/inst_complex_welcome.ycp 2010-08-18 13:49:46.000000000 +0200
+++ new/yast2-installation-2.20.4/src/clients/inst_complex_welcome.ycp 2011-01-07 13:36:47.000000000 +0100
@@ -20,7 +20,7 @@
* Attention:
* This is still work in progress ...
*
- * $Id: inst_complex_welcome.ycp 60766 2010-02-09 13:58:04Z locilka $
+ * $Id: inst_complex_welcome.ycp 63107 2011-01-06 11:28:04Z locilka $
*
*/
{
@@ -108,7 +108,8 @@
`Left (`Label (`opt(`boldFont), _("License Agreement"))),
// bnc #438100
`HSquash(`MinWidth (
- 85,
+ // BNC #607135
+ (text_mode ? 85 : 106),
`Left (`ReplacePoint (`id (`base_license_rp), `Empty()))
)),
`VSpacing (text_mode ? 0.1 : 0.5),
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/yast2-installation-2.20.1/src/clients/inst_finish.ycp new/yast2-installation-2.20.4/src/clients/inst_finish.ycp
--- old/yast2-installation-2.20.1/src/clients/inst_finish.ycp 2010-08-18 13:49:46.000000000 +0200
+++ new/yast2-installation-2.20.4/src/clients/inst_finish.ycp 2011-01-19 15:09:58.000000000 +0100
@@ -6,7 +6,7 @@
* Arvin Schnell
* Jiri Srain
*
- * $Id: inst_finish.ycp 58749 2009-09-24 13:49:49Z kmachalkova $
+ * $Id: inst_finish.ycp 63227 2011-01-19 14:09:58Z jsrain $
*/
{
@@ -297,7 +297,10 @@
return nil;
}
- if (info["when"]:nil != nil && ! contains (info["when"]:[], run_type))
+ if (info["when"]:nil != nil && ! contains (info["when"]:[], run_type) &&
+ // special hack for autoupgrade - should be as regular upgrade as possible, scripts are the only exception
+ (!(Mode::autoupgrade() && contains (info["when"]:[], `autoupg)))
+ )
return nil;
y2milestone ("inst_finish client %1 will be called", s);
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/yast2-installation-2.20.1/src/clients/inst_proposal.ycp new/yast2-installation-2.20.4/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.20.1/src/clients/inst_proposal.ycp 2010-11-18 12:42:59.000000000 +0100
+++ new/yast2-installation-2.20.4/src/clients/inst_proposal.ycp 2011-01-19 15:09:58.000000000 +0100
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_proposal.ycp 62866 2010-11-18 10:42:59Z jsrain $
+ * $Id: inst_proposal.ycp 63227 2011-01-19 14:09:58Z jsrain $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -65,7 +65,7 @@
symbol proposal_result = nil;
// skip if not interactive mode.
- if (!AutoinstConfig::Confirm && Mode::autoinst ()) {
+ if (!AutoinstConfig::Confirm && (Mode::autoinst () || Mode::autoupgrade ())) {
return `auto;
}
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/yast2-installation-2.20.1/src/clients/inst_system_analysis.ycp new/yast2-installation-2.20.4/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.20.1/src/clients/inst_system_analysis.ycp 2010-08-18 13:49:46.000000000 +0200
+++ new/yast2-installation-2.20.4/src/clients/inst_system_analysis.ycp 2011-01-19 15:09:58.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_system_analysis.ycp 56656 2009-04-07 11:03:22Z ug $
+ * $Id: inst_system_analysis.ycp 63227 2011-01-19 14:09:58Z jsrain $
*
*/
@@ -32,7 +32,7 @@
include "installation/misc.ycp";
include "packager/storage_include.ycp";
- if( Mode::autoinst() ) {
+ if( Mode::autoinst() || Mode::autoupgrade() ) {
Report::Import( $[ "messages":$[ "timeout":10 ],
"errors":$[ "timeout":10 ],
"warnings":$[ "timeout":10 ]]);
@@ -111,7 +111,7 @@
if (size (targetMap) == 0) {
if (found_controllers) {
- if( !Mode::autoinst() ) {
+ if( !(Mode::autoinst() || Mode::autoupgrade())) {
// pop-up error report
Report::Error(_("No hard disks were found for the installation.
Please check your hardware!
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/yast2-installation-2.20.1/src/clients/inst_worker_initial.ycp new/yast2-installation-2.20.4/src/clients/inst_worker_initial.ycp
--- old/yast2-installation-2.20.1/src/clients/inst_worker_initial.ycp 2010-08-18 13:49:46.000000000 +0200
+++ new/yast2-installation-2.20.4/src/clients/inst_worker_initial.ycp 2011-01-19 15:09:58.000000000 +0100
@@ -14,7 +14,7 @@
* Describing and calling all submodules.
* (For initial installation only).
*
- * $Id: inst_worker_initial.ycp 59301 2009-11-04 15:32:29Z mzugec $
+ * $Id: inst_worker_initial.ycp 63227 2011-01-19 14:09:58Z jsrain $
*/
{
textdomain "installation";
@@ -44,6 +44,7 @@
// All stages
SetAutoinstHandling ();
+ SetAutoupgHandling ();
SetGlobalInstallationFeatures ();
// Initial stage
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/yast2-installation-2.20.1/src/include/inst_inc_all.ycp new/yast2-installation-2.20.4/src/include/inst_inc_all.ycp
--- old/yast2-installation-2.20.1/src/include/inst_inc_all.ycp 2010-08-18 13:49:47.000000000 +0200
+++ new/yast2-installation-2.20.4/src/include/inst_inc_all.ycp 2011-01-19 15:09:58.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Miscelaneous functions
* Authors: Lukas Ocilka
*
- * $Id: inst_inc_all.ycp 59301 2009-11-04 15:32:29Z mzugec $
+ * $Id: inst_inc_all.ycp 63227 2011-01-19 14:09:58Z jsrain $
*
*/
{
@@ -101,6 +101,19 @@
Report::DisplayMessages(true, 10);
}
+ /**
+ * Sets autoupgrade behavior
+ */
+ void SetAutoupgHandling () {
+ // if profile is defined, first read it, then probe hardware
+ any autoinstall = SCR::Read(.etc.install_inf.AutoYaST);
+ if (autoinstall != nil && is ( autoinstall , string ) && (string)autoinstall != "")
+ {
+ ProductControl::DisableModule ("system_analysis");
+ ProductControl::DisableModule ("update_partition_auto");
+ }
+ }
+
void ShowTextFallbackMessage () {
if (
(Installation::text_fallback () || Installation::no_x11 ())
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/yast2-installation-2.20.1/src/include/inst_inc_second.ycp new/yast2-installation-2.20.4/src/include/inst_inc_second.ycp
--- old/yast2-installation-2.20.1/src/include/inst_inc_second.ycp 2010-08-18 13:49:47.000000000 +0200
+++ new/yast2-installation-2.20.4/src/include/inst_inc_second.ycp 2011-01-20 14:21:25.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Functions for second stage
* Authors: Lukas Ocilka
*
- * $Id: inst_inc_second.ycp 58958 2009-10-07 10:30:38Z jsuchome $
+ * $Id: inst_inc_second.ycp 63236 2011-01-20 13:21:24Z jsrain $
*
*/
{
@@ -455,13 +455,15 @@
}
void SetSecondStageInstallation () {
- // Detect mode early to be able to setup steps correctly
- if (FileUtils::Exists (Installation::destdir + Installation::file_update_mode)) {
- Mode::SetMode ("update");
- }
- else if (FileUtils::Exists (Installation::destdir + Installation::file_live_install_mode)) {
- Mode::SetMode ("live_installation");
- }
+ if (! Mode::autoupgrade()) {
+ // Detect mode early to be able to setup steps correctly
+ if (FileUtils::Exists (Installation::destdir + Installation::file_update_mode)) {
+ Mode::SetMode ("update");
+ }
+ else if (FileUtils::Exists (Installation::destdir + Installation::file_live_install_mode)) {
+ Mode::SetMode ("live_installation");
+ }
+ }
SetXENExceptions();
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/yast2-installation-2.20.1/src/inst_finish/save_config_finish.ycp new/yast2-installation-2.20.4/src/inst_finish/save_config_finish.ycp
--- old/yast2-installation-2.20.1/src/inst_finish/save_config_finish.ycp 2010-08-18 13:49:48.000000000 +0200
+++ new/yast2-installation-2.20.4/src/inst_finish/save_config_finish.ycp 2011-01-19 15:09:58.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: save_config_finish.ycp 59739 2009-11-24 15:19:03Z kmachalkova $
+ * $Id: save_config_finish.ycp 63227 2011-01-19 14:09:58Z jsrain $
*
*/
@@ -127,7 +127,7 @@
// progress step title
Progress::Title (_("Saving product information..."));
ProductFeatures::Save();
- if (Mode::autoinst ())
+ if (Mode::autoinst () || Mode::autoupgrade())
{
Progress::NextStep ();
// progress step title
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/yast2-installation-2.20.1/src/inst_finish/umount_finish.ycp new/yast2-installation-2.20.4/src/inst_finish/umount_finish.ycp
--- old/yast2-installation-2.20.1/src/inst_finish/umount_finish.ycp 2010-09-03 08:22:02.000000000 +0200
+++ new/yast2-installation-2.20.4/src/inst_finish/umount_finish.ycp 2011-01-19 15:39:07.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: umount_finish.ycp 62433 2010-08-25 13:58:20Z elvigia $
+ * $Id: umount_finish.ycp 63232 2011-01-19 14:39:07Z jsrain $
*
*/
@@ -22,6 +22,7 @@
import "Vendor";
import "String";
import "Internet";
+import "FileUtils";
any ret = nil;
string func = "";
@@ -74,9 +75,12 @@
}
});
- // remove [Installation::destdir]/etc/mtab which was faked for %post
- // scripts in inst_rpmcopy
- SCR::Execute(.target.remove, "/etc/mtab");
+ // symlink points to /proc, keep it (bnc#665437)
+ if (! FileUtils::IsLink ("/etc/mtab")) {
+ // remove [Installation::destdir]/etc/mtab which was faked for %post
+ // scripts in inst_rpmcopy
+ SCR::Execute(.target.remove, "/etc/mtab");
+ }
// Stop SCR on target
WFM::SCRClose (Installation::scr_handle);
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/yast2-installation-2.20.1/src/modules/ImageInstallation.ycp new/yast2-installation-2.20.4/src/modules/ImageInstallation.ycp
--- old/yast2-installation-2.20.1/src/modules/ImageInstallation.ycp 2010-11-18 16:44:10.000000000 +0100
+++ new/yast2-installation-2.20.4/src/modules/ImageInstallation.ycp 2011-01-19 12:12:32.000000000 +0100
@@ -898,7 +898,7 @@
y2milestone ("Output: %1", out);
string total_str = out["stdout"]:"";
total_str = splitstring(total_str, "\n")[1]:"";
- integer total_mb = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0");
+ integer total_mb = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0") / 1024;
/* Using df-based progress estimation, is rather faster
may be less precise
@@ -911,7 +911,7 @@
integer total_mb = tointeger (total_str);
*/
if (total_mb == 0)
- total_mb = 1024*1024*1024; // should be big enough
+ total_mb = 1024; // should be big enough
string tmp_pipe1 = (string)SCR::Read (.target.tmpdir) + "/system_clone_fifo_1";
string tmp_pipe2 = (string)SCR::Read (.target.tmpdir) + "/system_clone_fifo_2";
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/yast2-installation-2.20.1/src/modules/Vendor.ycp new/yast2-installation-2.20.4/src/modules/Vendor.ycp
--- old/yast2-installation-2.20.1/src/modules/Vendor.ycp 2010-08-18 13:49:47.000000000 +0200
+++ new/yast2-installation-2.20.4/src/modules/Vendor.ycp 2011-01-07 13:36:47.000000000 +0100
@@ -8,7 +8,7 @@
* Summary:
* provide vendor/driver update disk functions
*
- * $Id: Vendor.ycp 61206 2010-03-09 14:43:12Z locilka $
+ * $Id: Vendor.ycp 63104 2011-01-06 09:49:53Z locilka $
*
* Author:
* Klaus Kaempf
@@ -57,8 +57,8 @@
"cd /; \n" +
"for i in /tmp/update/[0-9]*/install ; do \n" +
// Logging extracting the driver update
- " echo # Installing Driver Update from $i >>" + logfile + "; \n" +
- " TMPFILE=${i}rpm_install_tmpfile; \n" +
+ " echo \"# Installing Driver Update from $i\">>" + logfile + "; \n" +
+ " TMPFILE=\"/tmp/update/${i}rpm_install_tmpfile\"; \n" +
" [ -x \"/bin/mktemp\" ] && TMPFILE=`/bin/mktemp`; \n" +
// Extracting the driver update archives
" cd $i; \n" +
@@ -80,7 +80,8 @@
// unpack update files and run update.post scripts
// via SCR chrooted into the installed system
- integer cmd = (integer) SCR::Execute (.target.bash, runcmd);
+ map cmd = (map) SCR::Execute (.target.bash_output, runcmd);
+ y2milestone ("Driver Update deployment returned: %1", cmd);
}
global define void DriverUpdate2 ()
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org