Author: jsrain Date: Fri Nov 6 09:48:14 2009 New Revision: 59358 URL: http://svn.opensuse.org/viewcvs/yast?rev=59358&view=rev Log: defined live workflow for SLES + SLED Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=59358&r1=59357&r2=59358&view=diff ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Fri Nov 6 09:48:14 2009 @@ -430,7 +430,21 @@ </proposal> - + <proposal> + <label>Live Installation Settings</label> + <mode>live_installation</mode> + <stage>initial</stage> + <name>initial</name> + no + + hwinfo + partitions + bootloader + keyboard + timezone + runlevel + + </proposal> <proposal> <label>Update Settings</label> <mode>update</mode> @@ -676,6 +690,91 @@ </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>complex_welcome</name> + no + yes + <arguments> + yes + </arguments> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>Time Zone</label> + <name>timezone</name> + <arguments> + yes + </arguments> + yes + </module> + <module> + <label>Disk</label> + <name>disk_proposal</name> + yes + yes + </module> + <module> + <label>User Settings</label> + <name>user_first</name> + </module> + <module> + <label>User Settings</label> + <name>root_first</name> + </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> + <!-- FATE #303860: Provide consistent progress during installation --> + <module> + <label>Perform Installation</label> + <name>prepareprogress</name> + </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> + <workflow> <defaults> <archs>all</archs> @@ -1092,6 +1191,38 @@ </workflow> <workflow> + <stage>continue</stage> + <mode>live_installation</mode> + <defaults> + yes + yes + <archs>all</archs> + </defaults> + <modules config:type="list"> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>Automatic Configuration</label> + <name>automatic_configuration</name> + no + no + </module> + <module> + <name>user_non_interactive</name> + <!-- BNC #401319, define client to call explicitly --> + <execute>inst_user</execute> + </module> + <module> + <name>live_cleanup</name> + no + </module> + + </modules> + </workflow> + + <workflow> <stage>initial</stage> <label>Base Installation</label> <mode>autoinstallation</mode> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=59358&r1=59357&r2=59358&view=diff ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Fri Nov 6 09:48:14 2009 @@ -485,6 +485,23 @@ </proposal> + + <proposal> + <label>Live Installation Settings</label> + <mode>live_installation</mode> + <stage>initial</stage> + <name>initial</name> + no + + hwinfo + partitions + bootloader + keyboard + timezone + runlevel + + </proposal> + <proposal> <label>Update Settings</label> <mode>update</mode> @@ -810,6 +827,91 @@ </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>complex_welcome</name> + no + yes + <arguments> + yes + </arguments> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>Time Zone</label> + <name>timezone</name> + <arguments> + yes + </arguments> + yes + </module> + <module> + <label>Disk</label> + <name>disk_proposal</name> + yes + yes + </module> + <module> + <label>User Settings</label> + <name>user_first</name> + </module> + <module> + <label>User Settings</label> + <name>root_first</name> + </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> + <!-- FATE #303860: Provide consistent progress during installation --> + <module> + <label>Perform Installation</label> + <name>prepareprogress</name> + </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> + <workflow> <defaults> <archs>all</archs> @@ -1271,6 +1373,38 @@ </workflow> <workflow> + <stage>continue</stage> + <mode>live_installation</mode> + <defaults> + yes + yes + <archs>all</archs> + </defaults> + <modules config:type="list"> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>Automatic Configuration</label> + <name>automatic_configuration</name> + no + no + </module> + <module> + <name>user_non_interactive</name> + <!-- BNC #401319, define client to call explicitly --> + <execute>inst_user</execute> + </module> + <module> + <name>live_cleanup</name> + no + </module> + + </modules> + </workflow> + + <workflow> <stage>initial</stage> <label>Base Installation</label> <mode>autoinstallation</mode> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org