Author: jsrain Date: Fri Aug 7 11:31:33 2009 New Revision: 58296 URL: http://svn.opensuse.org/viewcvs/yast?rev=58296&view=rev Log: use separate control file if present (/etc/YaST2/control-live.xml) Modified: branches/SuSE-Code-11-Branch/live-installer/VERSION branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp Modified: branches/SuSE-Code-11-Branch/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/live-installer/VERSION?rev=58296&r1=58295&r2=58296&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/live-installer/VERSION (original) +++ branches/SuSE-Code-11-Branch/live-installer/VERSION Fri Aug 7 11:31:33 2009 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes?rev=58296&r1=58295&r2=58296&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes Fri Aug 7 11:31:33 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 7 11:30:31 CEST 2009 - jsrain@suse.cz + +- use separate control file if present + (/etc/YaST2/control-live.xml) +- 2.17.3 + +------------------------------------------------------------------- Thu Nov 13 16:33:33 CET 2008 - jsrain@suse.cz - disable desktop automounter and warn if removable medias are Modified: branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp?rev=58296&r1=58295&r2=58296&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp (original) +++ branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp Fri Aug 7 11:31:33 2009 @@ -18,6 +18,8 @@ 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) { @@ -108,6 +110,7 @@ Stage::Set ("initial"); Storage::InitLibstorage (false); + ProductControl::custom_control_file = 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