Author: locilka
Date: Mon Dec 8 13:21:36 2008
New Revision: 53964
URL: http://svn.opensuse.org/viewcvs/yast?rev=53964&view=rev
Log:
- Added two more control-file examples.
Added:
trunk/installation/control/examples/add-on-1.xml
trunk/installation/control/examples/add-on-2.xml
Modified:
trunk/installation/package/yast2-installation.changes
Added: trunk/installation/control/examples/add-on-1.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/add-on-1.xml?rev=53964&view=auto
==============================================================================
--- trunk/installation/control/examples/add-on-1.xml (added)
+++ trunk/installation/control/examples/add-on-1.xml Mon Dec 8 13:21:36 2008
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+http://www.suse.com/1.0/yast2ns"
+ xmlns:config="http://www.suse.com/1.0/configns">
+ <textdomain>control-domain</textdomain>
+
+ <workflows config:type="list">
+ <!-- Installation on a running system -->
+ <workflow>
+ <stage>normal</stage>
+ <mode>installation,normal</mode>
+
+ <defaults>
+ no
+ no
+ </defaults>
+
+ <modules config:type="list">
+ <module>
+ <label>XYZ Installation</label>
+ <name>sw_single</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>XYZ Configuration</label>
+ <name>inst_XYZ</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>Registration</label>
+ <name>inst_suse_register</name>
+ yes
+ yes
+ </module>
+ </modules>
+ </workflow>
+ </workflows>
+
+ <update>
+ <workflows config:type="list">
+ <workflow>
+ <defaults>
+ yes
+ yes
+ </defaults>
+
+ <!-- Second Stage Installation -->
+ <stage>continue</stage>
+ <mode>installation</mode>
+
+ <!-- Installation: Insert -->
+
+
+ <before>suseconfig</before>
+ <modules config:type="list">
+ <module>
+ <label>XYZ Configuration</label>
+ <name>XYZ</name>
+ </module>
+ </modules>
+
+
+
+ </workflow>
+ </workflows>
+ </update>
+
+</productDefines>
Added: trunk/installation/control/examples/add-on-2.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/add-on-2.xml?rev=53964&view=auto
==============================================================================
--- trunk/installation/control/examples/add-on-2.xml (added)
+++ trunk/installation/control/examples/add-on-2.xml Mon Dec 8 13:21:36 2008
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+http://www.suse.com/1.0/yast2ns"
+ xmlns:config="http://www.suse.com/1.0/configns">
+ <!-- .mo-file must be in installation tarball -->
+ <textdomain>ABC</textdomain>
+ <!-- these options override base product's ones -->
+ <globals>
+
+ </globals>
+ <software>
+ auto
+ </software>
+ <partitioning>
+ false
+ 10G
+ </partitioning>
+ <network>
+ false
+ laptop
+ </network>
+ <!-- base product's list is preserved, these are appended -->
+
+ printer
+
+<!-- workflow for standalone product installation -->
+ <workflows config:type="list">
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ </defaults>
+ <label>Preparation</label>
+ <!-- mode and stage must be set this way -->
+ <mode>installation</mode>
+ <stage>normal</stage>
+ <modules config:type="list">
+ <module>
+ <label>License Agreement</label>
+ <name>license</name>
+ no
+ yes
+ </module>
+ </modules>
+ </workflow>
+ </workflows>
+ <!-- stuff for installation together with base products -->
+ <update>
+ <proposals config:type="list">
+ <proposal>
+ <label>ABC Installation Settings</label>
+ <mode>installation,demo,autoinstallation</mode>
+ <stage>initial</stage>
+ <name>initial</name>
+ no
+
+ module_1
+ module_2
+
+
+ module_3
+ module_4
+
+
+
+ <replace>old_module</replace>
+
+ module_5
+ module_6
+
+
+
+ </proposal>
+ </proposals>
+ <workflows config:type="list">
+ <workflow>
+ <defaults>
+ <archs>all</archs>
+ no
+ no
+ </defaults>
+ <mode>installation</mode>
+ <stage>initial</stage>
+
+ <module>
+ <heading>yes</heading>
+ <label>ABC configuration</label>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>a1_netsetup</name>
+ </module>
+ <module>
+ <label>Perform Installation</label>
+ <name>a2_netprobe</name>
+ </module>
+
+
+ finish
+
+
+
+ <before>perform</before>
+ <modules config:type="list">
+ <module>
+ <label>Perform Installation</label>
+ <name>i1_netprobe</name>
+ </module>
+ </modules>
+
+
+
+
+ <replace>language</replace>
+ <modules config:type="list">
+ <module>
+ <label>Perform Installation</label>
+ <name>r1_language</name>
+ </module>
+ </modules>
+
+
+ </workflow>
+ </workflows>
+
+
+ <module>before_chroot_1</module>
+ <module>before_chroot_2</module>
+
+
+ <module>after_chroot_1</module>
+ <module>after_chroot_2</module>
+
+
+ <module>before_umount_1</module>
+ <module>before_umount_2</module>
+
+
+ </update>
+</productDefines>
+
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=53964&r1=53963&r2=53964&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Dec 8 13:21:36 2008
@@ -2,6 +2,7 @@
Mon Dec 8 13:16:33 CET 2008 - locilka@suse.cz
- Updated control.rnc
+- Added two more control-file examples.
- Adjusted control-file examples (bnc #438678).
- 2.17.45
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
