Author: jsrain
Date: Tue Jan 6 14:44:36 2009
New Revision: 54402
URL: http://svn.opensuse.org/viewcvs/yast?rev=54402&view=rev
Log:
disable all repos before installation, reenable afterwards (bnc #450228)
Modified:
trunk/live-installer/package/yast2-live-installer.changes
trunk/live-installer/src/LiveInstaller.ycp
trunk/live-installer/src/inst_live_doit.ycp
trunk/live-installer/src/live-installer.ycp
Modified: trunk/live-installer/package/yast2-live-installer.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-live-installer.changes?rev=54402&r1=54401&r2=54402&view=diff
==============================================================================
--- trunk/live-installer/package/yast2-live-installer.changes (original)
+++ trunk/live-installer/package/yast2-live-installer.changes Tue Jan 6 14:44:36 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)
+
+-------------------------------------------------------------------
Thu Nov 13 16:33:33 CET 2008 - jsrain@suse.cz
- disable desktop automounter and warn if removable medias are
Modified: trunk/live-installer/src/LiveInstaller.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/LiveInstaller.ycp?rev=54402&r1=54401&r2=54402&view=diff
==============================================================================
--- trunk/live-installer/src/LiveInstaller.ycp (original)
+++ trunk/live-installer/src/LiveInstaller.ycp Tue Jan 6 14:44:36 2009
@@ -41,5 +41,8 @@
global boolean run_full_proposal = false;
+global list > source_states = [];
+
+global map > service_states = $[];
/* EOF */
}
Modified: trunk/live-installer/src/inst_live_doit.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_doit.ycp?rev=54402&r1=54401&r2=54402&view=diff
==============================================================================
--- trunk/live-installer/src/inst_live_doit.ycp (original)
+++ trunk/live-installer/src/inst_live_doit.ycp Tue Jan 6 14:44:36 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 state, LiveInstaller::service_states, {
+ Pkg::ServiceSet (s, state);
+ Pkg::ServiceSave (s);
+});
+
+
return `next;
} // client end
Modified: trunk/live-installer/src/live-installer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installer.ycp?rev=54402&r1=54401&r2=54402&view=diff
==============================================================================
--- trunk/live-installer/src/live-installer.ycp (original)
+++ trunk/live-installer/src/live-installer.ycp Tue Jan 6 14:44:36 2009
@@ -47,6 +47,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 s, LiveInstaller::source_states, {
+ s["enabled"] = false;
+ return s;
+ }));
+ foreach (string s, Pkg::ServiceAliases (), {
+ map 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";
@@ -120,6 +136,13 @@
symbol ret = ProductControl::Run();
y2milestone("ProductControl::Run() returned: %1", ret);
+ // reenable sources/services
+ Pkg::SourceEditSet (LiveInstaller::source_states);
+ foreach (string s, map 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
