Mailinglist Archive: yast-commit (183 mails)

< Previous Next >
[yast-commit] r62557 - in /branches/tmp/jsrain/unattended-migration/installation/control: control.SLED.xml control.SLES.xml
  • From: jsrain@xxxxxxxxxxxxxxxxx
  • Date: Thu, 07 Oct 2010 07:04:36 -0000
  • Message-id: <20101007070437.6D1B632391@xxxxxxxxxxxxxxxxx>
Author: jsrain
Date: Thu Oct 7 09:04:35 2010
New Revision: 62557

URL: http://svn.opensuse.org/viewcvs/yast?rev=62557&view=rev
Log:
updated workflow

Modified:

branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml

branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml

Modified:
branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml?rev=62557&r1=62556&r2=62557&view=diff
==============================================================================
---
branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml
(original)
+++
branches/tmp/jsrain/unattended-migration/installation/control/control.SLED.xml
Thu Oct 7 09:04:35 2010
@@ -467,7 +467,7 @@

<proposal>
<label>Installation Settings</label>
- <mode>update</mode>
+ <mode>update,autoupgrade</mode>
<stage>initial</stage>
<name>initial</name>
<enable_skip>no</enable_skip>
@@ -746,6 +746,7 @@
</modules>
</workflow>

+ <!-- assures that the same list of steps is shown in 2nd stage where
no special mode exists -->
<workflow>
<defaults>
<archs>all</archs>
@@ -754,111 +755,26 @@
<mode>update</mode>
<stage>initial</stage>
<modules config:type="list">
- <module>
- <name>complex_welcome</name>
- <label>Welcome</label>
- <enable_back>no</enable_back>
- <enable_next>yes</enable_next>
- <arguments>
- <first_run>yes</first_run>
- </arguments>
- <retranslate config:type="boolean">true</retranslate>
- </module>
- <module>
- <label>Welcome</label>
- <name>checkmedia</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>Disk Activation</label>
- <name>disks_activate</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>System Analysis</label>
- <name>system_analysis</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>System Analysis</label>
- <name>mode</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>System for Update</label>
- <name>update_partition</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autosetup_upgrade</name>
</module>
<module>
- <name>upgrade_urls</name>
- <enable_back>yes</enable_back>
- </module>
- <module>
- <label>Add-On Products</label>
- <name>add-on</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
<heading>yes</heading>
<label>Update</label>
</module>
<module>
- <label>Update Summary</label>
- <name>lilo_convert</name>
- <execute>inst_lilo_convert</execute>
- </module>
- <module>
- <label>Update Summary</label>
- <name>inital_update_proposal</name>
+ <label>AutoYaST Settings</label>
+ <name>initial_update_proposal</name>
<execute>inst_proposal</execute>
<proposal>initial</proposal>
- </module>
- <!--
- BNC #414490, #477778: Updating SLES 10 (hdX) to SLES 11
(sdX)
- produces multiple identical grub boot menu entries
- -->
- <module>
- <label>Perform Update</label>
- <name>bl_preupdate</name>
- <execute>bootloader_preupdate</execute>
- </module>
- <!--
- FATE #303860: Provide consistent progress during
installation
- BNC #438848: Also during upgrade
- -->
- <module>
- <label>Perform Update</label>
- <name>prepareprogress</name>
- </module>
-
- <module>
- <label>Perform Update</label>
- <name>do_resize</name>
- <update config:type="boolean">false</update>
- <archs>i386,x86_64,ia64</archs>
- </module>
- <module>
- <label>Perform Update</label>
- <name>prepdisk</name>
- </module>
- <module>
- <label>Perform Update</label>
- <name>kickoff</name>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
</module>
<module>
<label>Perform Update</label>
<name>rpmcopy</name>
</module>
- <module>
- <label>Perform Update</label>
- <name>finish</name>
- </module>
</modules>
</workflow>

@@ -1281,6 +1197,142 @@
<workflow>
<defaults>
<archs>all</archs>
+ </defaults>
+ <label>Preparation</label>
+ <mode>autoupgrade</mode>
+ <stage>initial</stage>
+ <modules config:type="list">
+<!--
+ <module>
+ <label>Disk Activation</label>
+ <name>disks_activate</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+-->
+ <module>
+ <label>System Analysis</label>
+ <name>system_analysis</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
+ <label>System for Update</label>
+ <name>update_partition_auto</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autoinit</name>
+ <archs>all</archs>
+ <retranslate config:type="boolean">true</retranslate>
+ </module>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autosetup_upgrade</name>
+ </module>
+<!--
+ <module>
+ <name>upgrade_urls</name>
+ <enable_back>yes</enable_back>
+ </module>
+-->
+<!--
+ <module>
+ <label>Add-On Products</label>
+ <name>add-on</name>
+ <enable_back>yes</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+-->
+ <module>
+ <heading>yes</heading>
+ <label>Update</label>
+ </module>
+<!--
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autosetup</name>
+ </module>
+-->
+<!--
+ <module>
+ <label>Update Summary</label>
+ <name>lilo_convert</name>
+ <execute>inst_lilo_convert</execute>
+ </module>
+-->
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>initial_update_proposal</name>
+ <execute>inst_proposal</execute>
+ <proposal>initial</proposal>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ </module>
+<!--
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>neco_co_urcite_neexistuje</name>
+ </module>
+-->
+ <!--
+ BNC #414490, #477778: Updating SLES 10 (hdX) to SLES 11
(sdX)
+ produces multiple identical grub boot menu entries
+ -->
+ <module>
+ <label>Perform Update</label>
+ <name>bl_preupdate</name>
+ <execute>bootloader_preupdate</execute>
+ </module>
+ <!--
+ FATE #303860: Provide consistent progress during
installation
+ BNC #438848: Also during upgrade
+ -->
+ <module>
+ <label>Perform Update</label>
+ <name>prepareprogress</name>
+ </module>
+
+ <module>
+ <label>Perform Update</label>
+ <name>do_resize</name>
+ <update config:type="boolean">false</update>
+ <archs>i386,x86_64,ia64</archs>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>prepdisk</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>kickoff</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>store_upgrade_software</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy</name>
+ </module>
+ <module>
+ <!-- FATE #304940: s390 reIPL -->
+ <label>Perform Update</label>
+ <name>reiplauto</name>
+ <archs>s390</archs>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>finish</name>
+ </module>
+ </modules>
+ </workflow>
+
+ <workflow>
+ <defaults>
+ <archs>all</archs>
<enable_back>no</enable_back>
<enable_next>no</enable_next>
</defaults>
@@ -1312,6 +1364,72 @@
</module>
</modules>
</workflow>
+
+ <!-- dummy, but needed to trigger 2nd stage -->
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </defaults>
+ <stage>continue</stage>
+ <mode>autoupgrade</mode>
+ <modules config:type="list">
+ <module>
+ <label>Perform Update</label>
+ <name>autopost</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy_secondstage</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>System Configuration</label>
+ <name>autoconfigure</name>
+ </module>
+ <module>
+ <label>Clean Up</label>
+ <name>suseconfig</name>
+ </module>
+ </modules>
+ </workflow>
+
+ <!-- is for AutoUpdate, special mode does not exist - for SP1, so that
2nd stage YaST needn't be modified -->
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </defaults>
+ <stage>continue</stage>
+ <mode>update</mode>
+ <modules config:type="list">
+ <module>
+ <label>Perform Update</label>
+ <name>autopost</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy_secondstage</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>System Configuration</label>
+ <name>autoconfigure</name>
+ </module>
+ <module>
+ <label>Clean Up</label>
+ <name>suseconfig</name>
+ </module>
+ </modules>
+ </workflow>

</workflows>
</productDefines>

Modified:
branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml
URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml?rev=62557&r1=62556&r2=62557&view=diff
==============================================================================
---
branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml
(original)
+++
branches/tmp/jsrain/unattended-migration/installation/control/control.SLES.xml
Thu Oct 7 09:04:35 2010
@@ -886,6 +886,7 @@
</modules>
</workflow>

+ <!-- assures that the same list of steps is shown in 2nd stage where
no special mode exists -->
<workflow>
<defaults>
<archs>all</archs>
@@ -894,117 +895,26 @@
<mode>update</mode>
<stage>initial</stage>
<modules config:type="list">
- <module>
- <name>complex_welcome</name>
- <label>Welcome</label>
- <enable_back>no</enable_back>
- <enable_next>yes</enable_next>
- <arguments>
- <first_run>yes</first_run>
- </arguments>
- <retranslate config:type="boolean">true</retranslate>
- </module>
- <module>
- <label>Welcome</label>
- <name>checkmedia</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>Disk Activation</label>
- <name>disks_activate</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>System Analysis</label>
- <name>system_analysis</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>System Analysis</label>
- <name>mode</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>System for Update</label>
- <name>update_partition</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
+ <module>
+ <label>AutoYaST Settings</label>
+ <name>autosetup_upgrade</name>
</module>
<module>
- <name>upgrade_urls</name>
- <enable_back>yes</enable_back>
- </module>
- <module>
- <label>Add-On Products</label>
- <name>add-on</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
<heading>yes</heading>
<label>Update</label>
</module>
<module>
- <label>Update Summary</label>
- <name>lilo_convert</name>
- <execute>inst_lilo_convert</execute>
- </module>
- <module>
- <label>Update Summary</label>
+ <label>AutoYaST Settings</label>
<name>initial_update_proposal</name>
<execute>inst_proposal</execute>
<proposal>initial</proposal>
- </module>
- <!--
- BNC #414490, #477778: Updating SLES 10 (hdX) to SLES 11
(sdX)
- produces multiple identical grub boot menu entries
- -->
- <module>
- <label>Perform Update</label>
- <name>bl_preupdate</name>
- <execute>bootloader_preupdate</execute>
- </module>
- <!--
- FATE #303860: Provide consistent progress during
installation
- BNC #438848: Also during upgrade
- -->
- <module>
- <label>Perform Update</label>
- <name>prepareprogress</name>
- </module>
-
- <module>
- <label>Perform Update</label>
- <name>do_resize</name>
- <update config:type="boolean">false</update>
- <archs>i386,x86_64,ia64</archs>
- </module>
- <module>
- <label>Perform Update</label>
- <name>prepdisk</name>
- </module>
- <module>
- <label>Perform Update</label>
- <name>kickoff</name>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
</module>
<module>
<label>Perform Update</label>
<name>rpmcopy</name>
</module>
- <module>
- <!-- FATE #304940: s390 reIPL -->
- <label>Perform Update</label>
- <name>reiplauto</name>
- <archs>s390</archs>
- </module>
- <module>
- <label>Perform Update</label>
- <name>finish</name>
- </module>
</modules>
</workflow>

@@ -1123,103 +1033,6 @@

<workflow>
<stage>continue</stage>
- <mode>update</mode>
- <defaults>
- <archs>all</archs>
- <enable_back>no</enable_back>
- <enable_next>no</enable_next>
- </defaults>
- <modules config:type="list">
- <module>
- <label>Perform Update</label>
- <name>rpmcopy_secondstage</name>
- </module>
- <module>
- <heading>yes</heading>
- <label>Configuration</label>
- </module>
- <module>
- <label>Network</label>
- <name>ask_net_test</name>
- <!-- The very first interactive dialog -->
- <enable_back>no</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>Network</label>
- <name>do_net_test</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>Customer Center</label>
- <name>addon_update_sources</name>
- </module>
- <module>
- <label>Customer Center</label>
- <name>suse_register</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>Online Update</label>
- <name>ask_online_update</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>Online Update</label>
- <name>you</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <module>
- <label>Online Update</label>
- <name>restore_settings</name>
- </module>
- <module>
- <label>Clean Up</label>
- <name>suseconfig</name>
- </module>
- <module>
- <label>Release Notes</label>
- <name>release_notes</name>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
-
- <!-- FATE #302495: New possibility to stop and disable ZMD -->
- <module>
- <!-- 'name' is used as ID only, see 'execute' -->
- <name>congratulate_all_archs</name>
- <execute>inst_congratulate</execute>
- <archs>i386,x86_64,ia64,ppc,ppc64</archs>
- <arguments>
-
<show_zmd_turnoff_checkbox>yes</show_zmd_turnoff_checkbox>
-
<zmd_turnoff_default_state>no</zmd_turnoff_default_state>
- </arguments>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
- <!-- S/390 and S/390x pre-selected by default -->
- <module>
- <!-- 'name' is used as ID only, see 'execute' -->
- <name>congratulate_s390_archs</name>
- <execute>inst_congratulate</execute>
- <archs>s390,s390x</archs>
- <arguments>
-
<show_zmd_turnoff_checkbox>yes</show_zmd_turnoff_checkbox>
-
<zmd_turnoff_default_state>yes</zmd_turnoff_default_state>
- </arguments>
- <enable_back>yes</enable_back>
- <enable_next>yes</enable_next>
- </module>
-
- </modules>
- </workflow>
-
- <workflow>
- <stage>continue</stage>
<mode>installation</mode>
<defaults>
<enable_back>yes</enable_back>
@@ -1595,7 +1408,6 @@
</modules>
</workflow>

-
<workflow>
<defaults>
<archs>all</archs>
@@ -1632,5 +1444,72 @@
</modules>
</workflow>

+ <!-- dummy, but needed to trigger 2nd stage -->
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </defaults>
+ <stage>continue</stage>
+ <mode>autoupgrade</mode>
+ <modules config:type="list">
+ <module>
+ <label>Perform Update</label>
+ <name>autopost</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy_secondstage</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>System Configuration</label>
+ <name>autoconfigure</name>
+ </module>
+ <module>
+ <label>Clean Up</label>
+ <name>suseconfig</name>
+ </module>
+ </modules>
+ </workflow>
+
+ <!-- is for AutoUpdate, special mode does not exist - for SP1, so that
2nd stage YaST needn't be modified -->
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
+ </defaults>
+ <stage>continue</stage>
+ <mode>update</mode>
+ <modules config:type="list">
+ <module>
+ <label>Perform Update</label>
+ <name>autopost</name>
+ </module>
+ <module>
+ <label>Perform Update</label>
+ <name>rpmcopy_secondstage</name>
+ </module>
+ <module>
+ <heading>yes</heading>
+ <label>Configuration</label>
+ </module>
+ <module>
+ <label>System Configuration</label>
+ <name>autoconfigure</name>
+ </module>
+ <module>
+ <label>Clean Up</label>
+ <name>suseconfig</name>
+ </module>
+ </modules>
+ </workflow>
+
+
</workflows>
</productDefines>

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages