Author: jsrain Date: Mon Nov 30 17:21:40 2009 New Revision: 59863 URL: http://svn.opensuse.org/viewcvs/yast?rev=59863&view=rev Log: merged from trunk Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes?rev=59863&r1=59862&r2=59863&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/package/yast2-live-installer.changes Mon Nov 30 17:21:40 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 6 14:41:29 CET 2009 - jsrain@suse.cz + +- disable all repos before installation, reenable afterwards + (bnc #450228) + +------------------------------------------------------------------- Tue Aug 11 13:01:49 CEST 2009 - jsrain@suse.cz - replace /etc/YaST2/control.xml before starting live installation Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp?rev=59863&r1=59862&r2=59863&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/LiveInstaller.ycp Mon Nov 30 17:21:40 2009 @@ -41,5 +41,8 @@ global boolean run_full_proposal = false; +global list<map<string,any> > source_states = []; + +global map<string, map<string,any> > service_states = $[]; /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp?rev=59863&r1=59862&r2=59863&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/inst_live_doit.ycp Mon Nov 30 17:21:40 2009 @@ -10,6 +10,7 @@ import "Progress"; import "Wizard"; import "ImageInstallation"; +import "LiveInstaller"; Installation::destdir = "/mnt"; @@ -131,6 +132,14 @@ Progress::Finish(); Progress::Title (_("Finished.")); +// reenable sources/services before their status gets stored in the target system +Pkg::SourceEditSet (LiveInstaller::source_states); +foreach (string s, map<string,any> state, LiveInstaller::service_states, { + Pkg::ServiceSet (s, state); + Pkg::ServiceSave (s); +}); + + return `next; } // client end Modified: branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp?rev=59863&r1=59862&r2=59863&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/live-installer/src/live-installer.ycp Mon Nov 30 17:21:40 2009 @@ -60,6 +60,22 @@ } } + // ensure all installation sources are disabled + boolean source_init_success = Pkg::SourceStartManager( false ); + if (source_init_success) { + LiveInstaller::source_states = Pkg::SourceEditGet(); + Pkg::SourceEditSet (maplist (map<string,any> s, LiveInstaller::source_states, { + s["enabled"] = false; + return s; + })); + foreach (string s, Pkg::ServiceAliases (), { + map<string,any> state = Pkg::ServiceGet (s); + LiveInstaller::service_states[s] = state; + state["enabled"] = false; + Pkg::ServiceSet (s, state); + }); + } + Installation::destdir = "/mnt"; Installation::scr_destdir = "/mnt"; import "Storage"; @@ -133,6 +149,13 @@ symbol ret = ProductControl::Run(); y2milestone("ProductControl::Run() returned: %1", ret); + // reenable sources/services + Pkg::SourceEditSet (LiveInstaller::source_states); + foreach (string s, map<string,any> state, LiveInstaller::service_states, { + Pkg::ServiceSet (s, state); + Pkg::ServiceSave (s); + }); + Pkg::SourceFinishAll(); Pkg::TargetFinish(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org