Skip to content

Commit

Permalink
- Moved installation workflow routines out of installation.ycp
Browse files Browse the repository at this point in the history 
- Adapted arguments of installation clients
- Enhanced control file and made it more readable (arguments of clients
  are clearer now)


svn path=/trunk/installation/; revision=20855
  • Loading branch information
Anas Nashif committed Jan 24, 2005
1 parent 6c58c73 commit ab8b23a
Show file tree
Hide file tree
Showing 20 changed files with 682 additions and 560 deletions.
5 changes: 4 additions & 1 deletion POTFILES
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
./control/control.glade
control/control.PROF.glade
control/control.SLES.glade
control/control.SLD.glade
control/control.glade
7 changes: 6 additions & 1 deletion configure.in.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@
@YAST2-CHECKS-TESTSUITE@

## Nasty hack: xgettext doesn't work for XML files, so let's symlink it
( cd control; ln -sf control.xml control.glade )
( cd control;
for xml in `ls *.xml`; do
ln -sf $xml `basename $xml .xml`.glade
done
)
find control -name *.glade > POTFILES


AX_CHECK_DOCBOOK
Expand Down
1 change: 0 additions & 1 deletion control/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ productdir = /var/lib/YaST2

control_DATA = \
control.xml \
control.SLES.xml \
control.dtd

product_DATA = ProductFeatures
Expand Down
111 changes: 60 additions & 51 deletions control/control.PROF.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ textdomain="control"
<label>Installation Settings</label>
<mode>installation,demo,autoinstallation</mode>
<stage>initial</stage>
<type>initial</type>
<name>initial</name>
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
<proposal_module>mode</proposal_module>
Expand All @@ -47,7 +47,7 @@ textdomain="control"
<proposal>
<label>Directory Installation</label>
<mode>normal</mode>
<type>dirinstall</type>
<name>dirinstall</name>
<stage>normal</stage>
<proposal_modules config:type="list">
<proposal_module>dirinstall_options</proposal_module>
Expand All @@ -57,7 +57,7 @@ textdomain="control"
<proposal>
<label>UML Installation Settings</label>
<mode>normal</mode>
<type>uml</type>
<name>uml</name>
<stage>normal</stage>
<proposal_modules config:type="list">
<proposal_module>uml_source</proposal_module>
Expand All @@ -70,7 +70,7 @@ textdomain="control"
<proposal>
<label>Update Settings</label>
<mode>update</mode>
<type>initial</type>
<name>initial</name>
<stage>normal</stage>
<proposal_modules config:type="list">
<proposal_module>update</proposal_module>
Expand All @@ -84,7 +84,7 @@ textdomain="control"
<label>Installation Settings</label>
<mode>update</mode>
<stage>initial</stage>
<type>initial</type>
<name>initial</name>
<proposal_modules config:type="list">
<proposal_module>hwinfo</proposal_module>
<proposal_module>mode</proposal_module>
Expand All @@ -99,7 +99,7 @@ textdomain="control"
</proposal>
<proposal>
<label>Network Configuration</label>
<type>network</type>
<name>network</name>
<stage>continue,normal</stage>
<proposal_modules config:type="list">
<proposal_module>
Expand Down Expand Up @@ -134,7 +134,7 @@ textdomain="control"
</proposal>
<proposal>
<label>Hardware Configuration</label>
<type>hardware</type>
<name>hardware</name>
<stage>continue</stage>
<proposal_modules config:type="list">
<proposal_module>x11</proposal_module>
Expand All @@ -150,27 +150,28 @@ textdomain="control"
<workflow>
<label>Base Installation</label>
<defaults>
<arguments>false,false</arguments>
<archs>all</archs>
</defaults>
<stage>initial</stage>
<mode>installation,update</mode>
<modules config:type="list">
<module>
<name>info</name>
<arguments>false,true</arguments>
</module>
<module>
<name>language</name>
<arguments>false,true,true</arguments>
<label>Language</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>
<arguments>true,true</arguments>
<label>Installation Settings</label>
<name>proposal</name>
<type>initial</type>
<proposal>initial</proposal>
</module>
<module>
<name>do_resize</name>
Expand Down Expand Up @@ -198,7 +199,6 @@ textdomain="control"
</workflow>
<workflow>
<defaults>
<arguments>false,false</arguments>
<archs>all</archs>
</defaults>
<stage>initial</stage>
Expand All @@ -208,35 +208,32 @@ textdomain="control"
<module>
<label>System Information</label>
<name>info</name>
<arguments>false,true</arguments>
</module>
<module>
<label>Perform Repair</label>
<name>repair</name>
<arguments>false,true,true</arguments>
</module>
</modules>
</workflow>
<workflow>
<defaults>
<arguments>false,false</arguments>
<archs>all</archs>
</defaults>
<stage>initial</stage>
<label>Base Installation</label>
<mode>screen_shot</mode>
<modules config:type="list">
<module>
<arguments>false,true,true</arguments>
<enable_next>yes</enable_next>
<enable_back>false</enable_back>
<label>Language</label>
<name>language</name>
<retranslate config:type="boolean">true</retranslate>
</module>
<module>
<label>Installation Settings</label>
<name>proposal</name>
<arguments>true,true</arguments>
<type>initial</type>
<proposal>initial</proposal>
</module>
<module>
<label>Perform Installation</label>
Expand All @@ -260,7 +257,6 @@ textdomain="control"
</workflow>
<workflow>
<defaults>
<arguments>false,false</arguments>
<archs>all</archs>
</defaults>
<stage>initial</stage>
Expand All @@ -270,19 +266,18 @@ textdomain="control"
<module>
<label>Language</label>
<name>info</name>
<arguments>false,true</arguments>
</module>
<module>
<arguments>false,true,true</arguments>
<enable_next>yes</enable_next>
<enable_back>false</enable_back>
<label>Language</label>
<name>language</name>
<retranslate config:type="boolean">true</retranslate>
</module>
<module>
<label>Installation Settings</label>
<name>proposal</name>
<arguments>true,true</arguments>
<type>initial</type>
<proposal>initial</proposal>
</module>
<module>
<label>Perform Installation</label>
Expand All @@ -309,7 +304,8 @@ textdomain="control"
<label>Configuration</label>
<mode>update</mode>
<defaults>
<arguments>false,false</arguments>
<enable_next>false</enable_next>
<enable_back>false</enable_back>
<archs>all</archs>
</defaults>
<modules config:type="list">
Expand All @@ -323,31 +319,35 @@ textdomain="control"
<module>
<label>Network</label>
<name>ask_net_test</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Network</label>
<name>do_net_test</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Online Update</label>
<name>you</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Clean Up</label>
<name>suseconfig</name>
<arguments>false,false</arguments>
</module>
<module>
<label>Release Notes</label>
<name>release_notes</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<name>congratulate</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
</modules>
</workflow>
Expand All @@ -356,7 +356,8 @@ textdomain="control"
<label>Configuration</label>
<mode>installation</mode>
<defaults>
<arguments>false,false</arguments>
<enable_next>false</enable_next>
<enable_back>false</enable_back>
<archs>all</archs>
</defaults>
<modules config:type="list">
Expand All @@ -376,62 +377,70 @@ textdomain="control"
<module>
<label>Root Password</label>
<name>root</name>
<arguments>false,true</arguments>
<enable_next>false</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Network</label>
<name>proposal</name>
<arguments>true,true</arguments>
<type>network</type>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
<proposal>network</proposal>
</module>
<module>
<name>fam</name>
</module>
<module>
<label>Network</label>
<name>ask_net_test</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Network</label>
<name>do_net_test</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Online Update</label>
<name>you</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Users</label>
<name>auth</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Users</label>
<name>user</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>

<module>
<label>Clean Up</label>
<name>suseconfig</name>
<arguments>false,false</arguments>
</module>
<module>
<label>Release Notes</label>
<name>release_notes</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
<module>
<label>Device Configuration</label>
<name>proposal</name>
<arguments>true,true</arguments>
<type>hardware</type>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
<proposal>hardware</proposal>
</module>
<module>
<name>congratulate</name>
<arguments>true,true</arguments>
<enable_next>true</enable_next>
<enable_back>true</enable_back>
</module>
</modules>
</workflow>
Expand All @@ -440,14 +449,14 @@ textdomain="control"
<label>Base Installation</label>
<mode>autoinstallation</mode>
<defaults>
<arguments>false,false</arguments>
<archs>all</archs>
<enable_next>false</enable_next>
<enable_back>false</enable_back>
</defaults>
<modules config:type="list">
<module>
<label>Auto-Install Settings</label>
<name>info</name>
<arguments>false,true</arguments>
</module>
<module>
<label>Auto-Install Settings</label>
Expand All @@ -463,7 +472,7 @@ textdomain="control"
<label>Auto-Install Settings</label>
<name>proposal</name>
<arguments>true,true</arguments>
<type>initial</type>
<proposal>initial</proposal>
</module>
<module>
<label>Perform Installation</label>
Expand All @@ -489,7 +498,8 @@ textdomain="control"
</workflow>
<workflow>
<defaults>
<arguments>false,false</arguments>
<enable_next>false</enable_next>
<enable_back>false</enable_back>
<archs>all</archs>
</defaults>
<stage>continue</stage>
Expand Down Expand Up @@ -517,7 +527,6 @@ textdomain="control"
<module>
<label>System Configuration</label>
<name>x11</name>
<arguments>false,false</arguments>
</module>
<module>
<label>Clean Up</label>
Expand Down
Loading

0 comments on commit ab8b23a

Please sign in to comment.