Author: jsrain Date: Fri Apr 4 14:02:20 2008 New Revision: 46090 URL: http://svn.opensuse.org/viewcvs/yast?rev=46090&view=rev Log: - do inst_kickoff after deploying images in order not to rewrite any files with files from the images - updated live installation workflow Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=46090&r1=46089&r2=46090&view=diff ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Fri Apr 4 14:02:20 2008 @@ -355,10 +355,6 @@ <label>Perform Installation</label> <name>prepdisk</name> </module> - <module> - <label>Perform Installation</label> - <name>kickoff</name> - </module> <!-- Installation from images --> <module> <label>Perform Installation</label> @@ -369,6 +365,12 @@ <name>deploy_image</name> </module> <!-- Installation from image --> + <!-- kickoff moved here in order not to replace files it writes + with files from the image --> + <module> + <label>Perform Installation</label> + <name>kickoff</name> + </module> <module> <label>Perform Installation</label> <name>rpmcopy</name> @@ -395,6 +397,17 @@ <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>Welcome</label> <name>inst_live_welcome</name> </module> @@ -402,6 +415,29 @@ <label>License Agreement</label> <name>inst_license</name> </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> Reply