[yast-commit] r45921 - in /trunk/installation: control/ package/ src/clients/

Author: jsrain Date: Tue Apr 1 11:38:27 2008 New Revision: 45921 URL: http://svn.opensuse.org/viewcvs/yast?rev=45921&view=rev Log: added live installation workflow to default control file updated inst_finish clients handling for live installation Modified: trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/copy_logs_finish.ycp trunk/installation/src/clients/inst_finish.ycp trunk/installation/src/clients/ldconfig_finish.ycp trunk/installation/src/clients/switch_scr_finish.ycp trunk/installation/src/clients/umount_finish.ycp Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=45921&r1=45920&r2=45921&view=diff ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Tue Apr 1 11:38:27 2008 @@ -151,6 +151,21 @@ </proposal> <proposal> + <label>Live Installation Settings</label> + <mode>live_installation</mode> + <stage>initial</stage> + <name>initial</name> + no + + hwinfo + partitions + bootloader + keyboard + timezone + + </proposal> + + <proposal> <label>Update Settings</label> <mode>update</mode> <name>initial</name> @@ -358,6 +373,74 @@ </modules> </workflow> + <!-- Stage: Initial, Mode: Live Installation --> + <workflow> + <defaults> + <archs>all</archs> + yes + yes + </defaults> + <label>Installation</label> + <mode>live_installation</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>Welcome</label> + <name>inst_live_welcome</name> + </module> + <module> + <label>License Agreement</label> + <name>inst_license</name> + </module> +<!-- + <module> + <label>Installation Settings</label> + <name>inst_live_simple_proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Installation Settings</label> + <name>inst_live_full_proposal</name> + <proposal>initial</proposal> + </module> +--> + <module> + <label>Installation Settings</label> + <name>inst_live_pre-proposal</name> + </module> + <module> + <label>Installation Settings</label> + <name>inst_proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Perform Installation</label> + <name>inst_do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Installation</label> + <name>inst_prepdisk</name> + </module> + <module> + <label>Perform Installation</label> + <name>inst_kickoff</name> + </module> + <module> + <label>Perform Installation</label> + <name>inst_live_doit</name> + no + no + </module> + <module> + <label>Perform Installation</label> + <name>inst_finish</name> + no + </module> + </modules> + </workflow> + <!-- Stage: Initial, Mode: Update --> <workflow> <defaults> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45921&r1=45920&r2=45921&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 1 11:38:27 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 1 12:36:52 CEST 2008 - jsrain@suse.cz + +- added live installation workflow to default control file +- updated inst_finish clients handling for live installation + +------------------------------------------------------------------- Tue Apr 1 10:15:34 CEST 2008 - jsrain@suse.cz - merged texts from proofread Modified: trunk/installation/src/clients/copy_logs_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/copy_logs_finish.ycp?rev=45921&r1=45920&r2=45921&view=diff ============================================================================== --- trunk/installation/src/clients/copy_logs_finish.ycp (original) +++ trunk/installation/src/clients/copy_logs_finish.ycp Tue Apr 1 11:38:27 2008 @@ -40,7 +40,7 @@ "steps" : 1, // progress step title "title" : _("Copying log files to installed system..."), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_finish.ycp?rev=45921&r1=45920&r2=45921&view=diff ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Tue Apr 1 11:38:27 2008 @@ -45,6 +45,7 @@ "mouse", "copy_files", "copy_systemfiles", + "live_copy_files", "switch_scr", ], ], @@ -54,6 +55,7 @@ "steps" : [ "ldconfig", "save_config", + "live_save_config", "runlevel", "desktop", "fonts", @@ -93,6 +95,7 @@ // progress stage "label" : _("Prepare system for initial boot"), "steps" : [ + "live_runme_at_boot", "vm", "driver_update2", // no second stage if possible @@ -157,12 +160,16 @@ run_type = `update; else if (Mode::autoinst ()) run_type = `autoinst; +else if (Mode::live_installation ()) + run_type = `live_installation; integer steps_count = 0; stages = maplist (map stage, stages, { list<map> steps = maplist (string s, stage["steps"]:[], { s = s + "_finish"; + +// TODO: check if client exists map info = (map)WFM::CallFunction (s, ["Info"]); if (info == nil) { Modified: trunk/installation/src/clients/ldconfig_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/ldconfig_finish.ycp?rev=45921&r1=45920&r2=45921&view=diff ============================================================================== --- trunk/installation/src/clients/ldconfig_finish.ycp (original) +++ trunk/installation/src/clients/ldconfig_finish.ycp Tue Apr 1 11:38:27 2008 @@ -37,7 +37,7 @@ "steps" : 1, // progress step title "title" : _("Setting up linker cache"), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") Modified: trunk/installation/src/clients/switch_scr_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/switch_scr_finish.ycp?rev=45921&r1=45920&r2=45921&view=diff ============================================================================== --- trunk/installation/src/clients/switch_scr_finish.ycp (original) +++ trunk/installation/src/clients/switch_scr_finish.ycp Tue Apr 1 11:38:27 2008 @@ -69,7 +69,7 @@ "steps" : 1, // progress step title "title" : _("Moving to installed system..."), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") Modified: trunk/installation/src/clients/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/umount_finish.ycp?rev=45921&r1=45920&r2=45921&view=diff ============================================================================== --- trunk/installation/src/clients/umount_finish.ycp (original) +++ trunk/installation/src/clients/umount_finish.ycp Tue Apr 1 11:38:27 2008 @@ -44,7 +44,7 @@ "steps" : 1, // progress step title "title" : _("Unmounting all mounted devices..."), - "when" : [ `installation, `update, `autoinst ], + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org