Author: locilka
Date: Thu Oct 2 19:15:11 2008
New Revision: 51802
URL: http://svn.opensuse.org/viewcvs/yast?rev=51802&view=rev
Log:
- Adjusted presentation_order for SLES and SLED installation
proposals - software has to be proposed as almost the last one
(bnc #431580).
Modified:
trunk/installation/control/control.SLED.xml
trunk/installation/control/control.SLES.xml
trunk/installation/control/control.openSUSE.xml
trunk/installation/package/yast2-installation.changes
Modified: trunk/installation/control/control.SLED.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=51802&r1=51801&r2=51802&view=diff
==============================================================================
--- trunk/installation/control/control.SLED.xml (original)
+++ trunk/installation/control/control.SLED.xml Thu Oct 2 19:15:11 2008
@@ -265,18 +265,52 @@
<stage>initial</stage>
<name>initial</name>
no
+
- hwinfo
- keyboard
- mouse
- partitions
- add-on
- software
- bootloader
- timezone
- language
- runlevel
+
+ <name>hwinfo</name>
+ 10
+
+
+ <name>keyboard</name>
+ 15
+
+
+ <name>mouse</name>
+ 20
+
+
+ <name>partitions</name>
+ 25
+
+
+ <name>add-on</name>
+ 30
+
+
+ <name>bootloader</name>
+ 40
+
+
+ <name>language</name>
+ 50
+
+
+ <name>timezone</name>
+ 45
+
+ <!-- software proposal should be computed almost at the end -->
+
+ <name>software</name>
+ 35
+
+ <!-- propose the default runlevel after software is selected, bnc #380141 -->
+
+ <name>runlevel</name>
+ 55
+
+
<label>Overview</label>
@@ -327,9 +361,6 @@
hwinfo
media
-
update
add-on
packages
Modified: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=51802&r1=51801&r2=51802&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Thu Oct 2 19:15:11 2008
@@ -265,18 +265,54 @@
<stage>initial</stage>
<name>initial</name>
no
+
- hwinfo
- keyboard
- mouse
- partitions
- add-on
- software
- bootloader
- timezone
- language
- runlevel
- kdump
+
+ <name>hwinfo</name>
+ 10
+
+
+ <name>keyboard</name>
+ 15
+
+
+ <name>mouse</name>
+ 20
+
+
+ <name>partitions</name>
+ 25
+
+
+ <name>add-on</name>
+ 30
+
+
+ <name>bootloader</name>
+ 40
+
+
+ <name>kdump</name>
+ 60
+
+
+ <name>language</name>
+ 50
+
+
+ <name>timezone</name>
+ 45
+
+ <!-- software proposal should be computed almost at the end -->
+
+ <name>software</name>
+ 35
+
+ <!-- propose the default runlevel after software is selected, bnc #380141 -->
+
+ <name>runlevel</name>
+ 55
+
@@ -308,6 +344,7 @@
</proposal>
+
<proposal>
<archs>s390</archs>
<label>Installation Settings</label>
@@ -315,19 +352,56 @@
<stage>initial</stage>
<name>initial</name>
no
+
- hwinfo
- mouse
- partitions
- add-on
- software
- bootloader
- timezone
- language
- runlevel
- dasd
- zfcp
+
+ <name>hwinfo</name>
+ 10
+
+
+ <name>mouse</name>
+ 15
+
+
+ <name>partitions</name>
+ 20
+
+
+ <name>add-on</name>
+ 25
+
+
+ <name>bootloader</name>
+ 35
+
+
+ <name>language</name>
+ 45
+
+
+ <name>timezone</name>
+ 40
+
+
+ <name>dasd</name>
+ 55
+
+
+ <name>zfcp</name>
+ 60
+
+ <!-- software proposal should be computed almost at the end -->
+
+ <name>software</name>
+ 30
+
+ <!-- propose the default runlevel after software is selected, bnc #380141 -->
+
+ <name>runlevel</name>
+ 50
+
+
<label>Overview</label>
@@ -375,18 +449,16 @@
<stage>initial</stage>
<name>initial</name>
no
+
hwinfo
media
-
- update
+ update
add-on
- packages
- backup
- language
- keyboard
+ packages
+ backup
+ language
+ keyboard
</proposal>
@@ -399,16 +471,13 @@
no
hwinfo
-
update
add-on
+ dasd
+ zfcp
packages
backup
language
- dasd
- zfcp
</proposal>
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=51802&r1=51801&r2=51802&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Thu Oct 2 19:15:11 2008
@@ -497,9 +497,6 @@
hwinfo
media
-
update
packages
backup
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=51802&r1=51801&r2=51802&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Thu Oct 2 19:15:11 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Oct 2 19:13:07 CEST 2008 - locilka@suse.cz
+
+- Adjusted presentation_order for SLES and SLED installation
+ proposals - software has to be proposed as almost the last one
+ (bnc #431580).
+
+-------------------------------------------------------------------
Thu Oct 2 14:00:49 CEST 2008 - locilka@suse.cz
- Added 'default_ntp_setup' into control files (SLES/D: false,
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org