Author: locilka Date: Fri Jun 15 10:14:51 2007 New Revision: 38478 URL: http://svn.opensuse.org/viewcvs/yast?rev=38478&view=rev Log: - Make sure that online update is called again after restarting YaST or system during online update (#281818). - 2.13.196 Modified: branches/SuSE-SLE-10-SP1-Branch/installation/VERSION branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP1-Branch/installation/src/clients/installation_worker.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/installation/VERSION?rev=38478&r1=38477&r2=38478&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/installation/VERSION Fri Jun 15 10:14:51 2007 @@ -1 +1 @@ -2.13.195 +2.13.196 Modified: branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes?rev=38478&r1=38477&r2=38478&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes Fri Jun 15 10:14:51 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 15 09:41:19 CEST 2007 - locilka@suse.cz + +- Make sure that online update is called again after restarting + YaST or system during online update (#281818). +- 2.13.196 + +------------------------------------------------------------------- Wed Jun 13 09:53:39 CEST 2007 - locilka@suse.cz - Start SuSEfirewall2_setup after system is rebooted during Modified: branches/SuSE-SLE-10-SP1-Branch/installation/src/clients/installation_worker.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/installation/src/clients/installation_worker.ycp?rev=38478&r1=38477&r2=38478&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/installation/src/clients/installation_worker.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/installation/src/clients/installation_worker.ycp Fri Jun 15 10:14:51 2007 @@ -32,6 +32,7 @@ import "ProductControl"; import "ProductFeatures"; import "Language"; + import "Internet"; Installation::scr_handle = scr_handle; import "Mouse"; @@ -416,13 +417,25 @@ // Continue the second stage installation if (Stage::cont () && FileUtils::Exists (restart_data_file)) { + // restart_data_file indicates that YaST has been restarted during + // online update, continuing with online_update... + // bugzilla #281818 comment #22, #26 + y2milestone ("Installation has been restarted because of online update, adjusting Internet::do_you=true"); + Internet::do_you = true; + + // creating special flag for online update + // see 'inst_you' client + // that script uses either restart_data_file or this hack-file to determine + // YaST or system restart during online update just to initialize sources and pkg-manager + SCR::Execute (.target.bash, "touch '/tmp/hack-init-target-and-sources'"); + // System was rebooted during the second stage. // Restore network and firewall settings. WFM::call ("inst_restore_settings"); string contents = (string) SCR::Read (.target.string, restart_data_file); - // file will be created if it is needed + // file will be created only if it is needed y2milestone ("Removing %1 file containing %2", restart_data_file, contents); SCR::Execute(.target.remove, restart_data_file); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org