Author: jsrain Date: Wed Feb 13 14:18:45 2008 New Revision: 44418 URL: http://svn.opensuse.org/viewcvs/yast?rev=44418&view=rev Log: added handling of update initiated from running system Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_worker_initial.ycp trunk/installation/src/include/inst_inc_first.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=44418&r1=44417&r2=44418&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Feb 13 14:18:45 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 13 14:18:16 CET 2008 - jsrain@suse.cz + +- added handling of update initiated from running system + +------------------------------------------------------------------- Tue Feb 12 10:26:15 CET 2008 - locilka@suse.cz - Added new update_wizard_steps YCP client for easy updating or Modified: trunk/installation/src/clients/inst_worker_initial.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_worker_initial.ycp?rev=44418&r1=44417&r2=44418&view=diff ============================================================================== --- trunk/installation/src/clients/inst_worker_initial.ycp (original) +++ trunk/installation/src/clients/inst_worker_initial.ycp Wed Feb 13 14:18:45 2008 @@ -48,6 +48,9 @@ // Initial stage SetInitialInstallation (); + // Update initiated from running system + SetSystemUpdate (); + // All stages SetUIContent(); Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_first.ycp?rev=44418&r1=44417&r2=44418&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Wed Feb 13 14:18:45 2008 @@ -69,4 +69,23 @@ } } + /** + * Handle starting distro upgrade from running system + */ + void SetSystemUpdate () { + if (FileUtils::Exists (Installation::run_update_file)) { + Mode::SetMode ("update"); + foreach (string m, [ + "language", // language already selected + "disks_activate", // disks activated before running upgrade + "mode", // always doing update, is already preselected + "update_partition", // no mounting + "do_resize", // why is this included in upgrade at all? it is empty anyway + "prepdisk", // disks already mounted, it is dummy in update anyway + ], { + ProductControl::DisabledModules = add (ProductControl::DisabledModules, m); + }); + } + } + } //end of include -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org