[yast-commit] r58397 - in /trunk/live-installer: VERSION package/yast2-live-installer.changes src/live-installer.ycp
Author: jsrain Date: Thu Aug 20 13:28:21 2009 New Revision: 58397 URL: http://svn.opensuse.org/viewcvs/yast?rev=58397&view=rev Log: fixed calling the workflow modules (bnc#532502) Modified: trunk/live-installer/VERSION trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/live-installer.ycp Modified: trunk/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/VERSION?rev=58397&r1=58396&r2=58397&view=diff ============================================================================== --- trunk/live-installer/VERSION (original) +++ trunk/live-installer/VERSION Thu Aug 20 13:28:21 2009 @@ -1 +1 @@ -2.18.5 +2.18.6 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=58397&r1=58396&r2=58397&view=diff ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Aug 20 13:28:21 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 20 13:16:39 CEST 2009 - jsrain@suse.cz + +- fixed calling the workflow modules (bnc#532502) +- 2.18.6 + +------------------------------------------------------------------- Wed Aug 12 08:57:23 CEST 2009 - jsrain@suse.cz - remove /usr/bin/correct_live_install after installation Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installer.ycp?rev=58397&r1=58396&r2=58397&view=diff ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Thu Aug 20 13:28:21 2009 @@ -18,8 +18,6 @@ import "CommandLine"; import "Popup"; - string live_control_file = "/etc/YaST2/control-live.xml"; - // Bugzilla #269890, CommanLine "support" // argmap is only a map, CommandLine uses string parameters if (size (WFM::Args()) > 0) { @@ -120,13 +118,13 @@ $["stage": "initial", "mode": "live_installation" ], $["stage": "continue", "mode": "live_installation" ] ]; - y2internal ("SM: %1", stage_mode); Mode::SetMode ("live_installation"); // Stage::initial is required for most of the modules to behave correctly Stage::Set ("initial"); Storage::InitLibstorage (false); - ProductControl::custom_control_file = live_control_file; + if (0 < size((map)SCR::Read (.target.stat, LiveInstaller::live_control_file))) + ProductControl::custom_control_file = LiveInstaller::live_control_file; if (!ProductControl::Init()) y2error("control file %1 not found", ProductControl::custom_control_file ); ProductControl::AddWizardSteps(stage_mode); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsrain@svn.opensuse.org