Author: jsrain Date: Tue Apr 1 11:39:05 2008 New Revision: 45923 URL: http://svn.opensuse.org/viewcvs/yast?rev=45923&view=rev Log: merged live installation control file to default control file updated inst_finish steps handling Removed: trunk/live-installer/src/control/ Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/Makefile.am trunk/live-installer/src/live-installer.ycp trunk/live-installer/src/live_copy_files_finish.ycp trunk/live-installer/src/live_runme_at_boot_finish.ycp trunk/live-installer/src/live_save_config_finish.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=45923&r1=45922&r2=45923&view=diff ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Tue Apr 1 11:39:05 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 1 12:38:36 CEST 2008 - jsrain@suse.cz + +- merged live installation control file to default control file +- updated inst_finish steps handling + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/live-installer/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/Makefile.am?rev=45923&r1=45922&r2=45923&view=diff ============================================================================== --- trunk/live-installer/src/Makefile.am (original) +++ trunk/live-installer/src/Makefile.am Tue Apr 1 11:39:05 2008 @@ -1,7 +1,5 @@ # Makefile.am for live-installer/src -SUBDIRS = control - yncludedir = @yncludedir@/live-installer client_DATA = \ Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installer.ycp?rev=45923&r1=45922&r2=45923&view=diff ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Tue Apr 1 11:39:05 2008 @@ -69,7 +69,7 @@ Stage::Set ("initial"); Storage::InitLibstorage (); - ProductControl::custom_control_file = 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); Modified: trunk/live-installer/src/live_copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live_copy_files_finish.ycp?rev=45923&r1=45922&r2=45923&view=diff ============================================================================== --- trunk/live-installer/src/live_copy_files_finish.ycp (original) +++ trunk/live-installer/src/live_copy_files_finish.ycp Tue Apr 1 11:39:05 2008 @@ -49,7 +49,7 @@ "steps" : 1, // progress step title "title" : _("Copying files to installed system..."), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `live_installation ], ]; } else if (func == "Write") Modified: trunk/live-installer/src/live_runme_at_boot_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live_runme_at_boot_finish.ycp?rev=45923&r1=45922&r2=45923&view=diff ============================================================================== --- trunk/live-installer/src/live_runme_at_boot_finish.ycp (original) +++ trunk/live-installer/src/live_runme_at_boot_finish.ycp Tue Apr 1 11:39:05 2008 @@ -43,7 +43,7 @@ "steps" : 1, // progress step title "title" : _("Writing YaST Configuration..."), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `live_installation ], ]; } else if (func == "Write") Modified: trunk/live-installer/src/live_save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live_save_config_finish.ycp?rev=45923&r1=45922&r2=45923&view=diff ============================================================================== --- trunk/live-installer/src/live_save_config_finish.ycp (original) +++ trunk/live-installer/src/live_save_config_finish.ycp Tue Apr 1 11:39:05 2008 @@ -40,7 +40,7 @@ { return (any)$[ "steps" : 1, - "when" : [ `installation, `update, `autoinst ], + "when" : [ `live_installation ], ]; } else if (func == "Write") -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org