Author: locilka
Date: Tue Sep 2 18:17:51 2008
New Revision: 50588
URL: http://svn.opensuse.org/viewcvs/yast?rev=50588&view=rev
Log:
- All 'inst_proposal' calls changed to use the new 'execute'
feature to have unique 'name's (needed for merging add-on control
files).
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=50588&r1=50587&r2=50588&view=diff
==============================================================================
--- trunk/installation/control/control.SLED.xml (original)
+++ trunk/installation/control/control.SLED.xml Tue Sep 2 18:17:51 2008
@@ -445,7 +445,8 @@
</module>
<module>
<label>Installation Overview</label>
- <name>proposal</name>
+ <name>initial_installation_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -543,7 +544,8 @@
</module>
<module>
<label>Update Summary</label>
- <name>proposal</name>
+ <name>inital_update_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<module>
@@ -607,7 +609,8 @@
</module>
<module>
<label>Installation Settings</label>
- <name>proposal</name>
+ <name>initial_screenshot_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -653,7 +656,8 @@
</module>
<module>
<label>Installation Settings</label>
- <name>proposal</name>
+ <name>initial_demo_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -803,7 +807,8 @@
</module>
<module>
<label>Network</label>
- <name>proposal</name>
+ <name>continue_network_proposal</name>
+ <execute>proposal</execute>
<proposal>network</proposal>
</module>
<module>
@@ -868,7 +873,8 @@
</module>
<module>
<label>Hardware Configuration</label>
- <name>proposal</name>
+ <name>continue_hardware_proposal</name>
+ <execute>proposal</execute>
<proposal>hardware</proposal>
</module>
<module>
@@ -904,7 +910,8 @@
</module>
<module>
<label>AutoYaST Settings</label>
- <name>proposal</name>
+ <name>initial_autoyast_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
no
yes
Modified: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=50588&r1=50587&r2=50588&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Tue Sep 2 18:17:51 2008
@@ -544,7 +544,8 @@
</module>
<module>
<label>Installation Summary</label>
- <name>proposal</name>
+ <name>initial_installation_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -647,7 +648,8 @@
</module>
<module>
<label>Update Summary</label>
- <name>proposal</name>
+ <name>initial_update_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<module>
@@ -717,7 +719,8 @@
</module>
<module>
<label>Installation Settings</label>
- <name>proposal</name>
+ <name>initial_screenshot_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -763,7 +766,8 @@
</module>
<module>
<label>Installation Settings</label>
- <name>proposal</name>
+ <name>initial_demo_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -860,7 +864,9 @@
<!-- FATE #302495: New possibility to stop and disable ZMD -->
<module>
- <name>congratulate</name>
+ <!-- 'name' is used as ID only, see 'execute' -->
+ <name>congratulate_all_archs</name>
+ <execute>congratulate</execute>
<archs>i386,x86_64,ia64,ppc,ppc64</archs>
<arguments>
yes
@@ -871,7 +877,9 @@
</module>
<!-- S/390 and S/390x pre-selected by default -->
<module>
- <name>congratulate</name>
+ <!-- 'name' is used as ID only, see 'execute' -->
+ <name>congratulate_s390_archs</name>
+ <execute>congratulate</execute>
<archs>s390,s390x</archs>
<arguments>
yes
@@ -926,7 +934,8 @@
</module>
<module>
<label>Network</label>
- <name>proposal</name>
+ <name>continue_network_proposal</name>
+ <execute>proposal</execute>
<proposal>network</proposal>
</module>
<module>
@@ -967,7 +976,8 @@
</module>
<module>
<label>Service</label>
- <name>proposal</name>
+ <name>continue_service_proposal</name>
+ <execute>proposal</execute>
<proposal>service</proposal>
</module>
<module>
@@ -990,7 +1000,8 @@
</module>
<module>
<label>Hardware Configuration</label>
- <name>proposal</name>
+ <name>continue_hardware_proposal</name>
+ <execute>proposal</execute>
<proposal>hardware</proposal>
</module>
<module>
@@ -1048,7 +1059,8 @@
</module>
<module>
<label>AutoYaST Settings</label>
- <name>proposal</name>
+ <name>initial_autoinstallation_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
no
yes
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=50588&r1=50587&r2=50588&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Tue Sep 2 18:17:51 2008
@@ -531,7 +531,8 @@
</module>
<module>
<label>Installation Overview</label>
- <name>proposal</name>
+ <name>initial_installation_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -737,7 +738,8 @@
</module>
<module>
<label>Update Settings</label>
- <name>proposal</name>
+ <name>initial_update_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<module>
@@ -807,7 +809,8 @@
</module>
<module>
<label>Installation Settings</label>
- <name>proposal</name>
+ <name>initial_screenshot_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -857,7 +860,8 @@
</module>
<module>
<label>Installation Settings</label>
- <name>proposal</name>
+ <name>initial_demo_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
</module>
<!-- FATE #303860: Provide consistent progress during installation -->
@@ -1009,7 +1013,8 @@
</module>
<module>
<label>Network</label>
- <name>proposal</name>
+ <name>continue_network_proposal</name>
+ <execute>proposal</execute>
<proposal>network</proposal>
</module>
<module>
@@ -1069,7 +1074,8 @@
</module>
<module>
<label>Hardware Configuration</label>
- <name>proposal</name>
+ <name>continue_hardware_proposal</name>
+ <execute>proposal</execute>
<proposal>hardware</proposal>
</module>
<module>
@@ -1148,7 +1154,8 @@
</module>
<module>
<label>AutoYaST Settings</label>
- <name>proposal</name>
+ <name>initial_autoinstallation_proposal</name>
+ <execute>proposal</execute>
<proposal>initial</proposal>
no
yes
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=50588&r1=50587&r2=50588&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Tue Sep 2 18:17:51 2008
@@ -6,6 +6,9 @@
(openSUSE, SLED control files) (bnc #401319).
- Updated control files to call inst_prepareprogress to
"Provide consistent progress during installation" (FATE #303860).
+- All 'inst_proposal' calls changed to use the new 'execute'
+ feature to have unique 'name's (needed for merging add-on control
+ files).
-------------------------------------------------------------------
Tue Sep 2 11:10:01 CEST 2008 - visnov@suse.cz
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org