Author: locilka Date: Thu Oct 4 13:26:12 2007 New Revision: 41253 URL: http://svn.opensuse.org/viewcvs/yast?rev=41253&view=rev Log: Merging changes done in trunk back to the 10.3 branch Added: branches/SuSE-Linux-10_3-Branch/live-installer/src/inst_live_prepare_net_test.ycp Modified: branches/SuSE-Linux-10_3-Branch/live-installer/VERSION branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml Modified: branches/SuSE-Linux-10_3-Branch/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/VERSION?rev=41253&r1=41252&r2=41253&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/VERSION Thu Oct 4 13:26:12 2007 @@ -1 +1 @@ -2.15.10 +2.15.12 Modified: branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes?rev=41253&r1=41252&r2=41253&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes Thu Oct 4 13:26:12 2007 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Sep 26 17:16:13 CEST 2007 - jsrain@suse.cz + +- added missing step to prepare internet test (#325560) +- 2.15.12 + +------------------------------------------------------------------- +Wed Sep 26 15:12:33 CEST 2007 - jsrain@suse.cz + +- go directly to full installation proposal (#310883) +- 2.15.11 + +------------------------------------------------------------------- Fri Sep 21 11:03:10 CEST 2007 - locilka@suse.cz - Calling /usr/bin/correct_live_install script if it exists Modified: branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am?rev=41253&r1=41252&r2=41253&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am Thu Oct 4 13:26:12 2007 @@ -14,7 +14,8 @@ inst_live_welcome.ycp \ inst_live_full_proposal.ycp \ inst_live_simple_proposal.ycp \ - inst_live_cleanup.ycp + inst_live_cleanup.ycp \ + inst_live_prepare_net_test.ycp desktop_DATA = \ live-installer.desktop Modified: branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml?rev=41253&r1=41252&r2=41253&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml Thu Oct 4 13:26:12 2007 @@ -149,6 +149,7 @@ <label>License Agreement</label> <name>inst_license</name> </module> +<!-- <module> <label>Installation Settings</label> <name>inst_live_simple_proposal</name> @@ -159,6 +160,12 @@ <name>inst_live_full_proposal</name> <proposal>initial</proposal> </module> +--> + <module> + <label>Installation Settings</label> + <name>inst_proposal</name> + <proposal>initial</proposal> + </module> <module> <label>Perform Installation</label> <name>inst_do_resize</name> @@ -206,6 +213,10 @@ </module> <module> <label>Online Update</label> + <name>inst_live_prepare_net_test</name> + </module> + <module> + <label>Online Update</label> <name>inst_do_net_test</name> </module> Reply