Author: jsrain Date: Mon Jul 12 13:52:46 2010 New Revision: 62221 URL: http://svn.opensuse.org/viewcvs/yast?rev=62221&view=rev Log: added handling of autoupgrade Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp?rev=62221&r1=62220&r2=62221&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_finish.ycp Mon Jul 12 13:52:46 2010 @@ -243,7 +243,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); Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp?rev=62221&r1=62220&r2=62221&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_proposal.ycp Mon Jul 12 13:52:46 2010 @@ -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; } Modified: branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp?rev=62221&r1=62220&r2=62221&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/clients/inst_worker_initial.ycp Mon Jul 12 13:52:46 2010 @@ -44,6 +44,7 @@ // All stages SetAutoinstHandling (); + SetAutoupgHandling (); SetGlobalInstallationFeatures (); // Initial stage Modified: branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp?rev=62221&r1=62220&r2=62221&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp (original) +++ branches/tmp/jsrain/unattended-migration/installation/src/include/inst_inc_all.ycp Mon Jul 12 13:52:46 2010 @@ -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 ()) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org