Author: jsrain Date: Thu Jan 20 14:21:24 2011 New Revision: 63236 URL: http://svn.opensuse.org/viewcvs/yast?rev=63236&view=rev Log: fix initialization of AutoUpgrade for 2nd stage Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_second.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63236&r1=63235&r2=63236&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Jan 20 14:21:24 2011 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=63236&r1=63235&r2=63236&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jan 20 14:21:24 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +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) 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=63236&r1=63235&r2=63236&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_second.ycp (original) +++ trunk/installation/src/include/inst_inc_second.ycp Thu Jan 20 14:21:24 2011 @@ -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(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org