Author: jsuchome Date: Wed May 13 11:59:17 2009 New Revision: 57148 URL: http://svn.opensuse.org/viewcvs/yast?rev=57148&view=rev Log: - correct syntax of replace_modules in installation.xml - create control-SLEPOS.pot file from installation.xml strings - 2.17.2 Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION branches/SuSE-Code-11-Branch/pos-installation/configure.in.in branches/SuSE-Code-11-Branch/pos-installation/control/installation.xml branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-installation/VERSION?rev=57148&r1=57147&r2=57148&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/pos-installation/VERSION Wed May 13 11:59:17 2009 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: branches/SuSE-Code-11-Branch/pos-installation/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-installation/configure.in.in?rev=57148&r1=57147&r2=57148&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/configure.in.in (original) +++ branches/SuSE-Code-11-Branch/pos-installation/configure.in.in Wed May 13 11:59:17 2009 @@ -8,5 +8,10 @@ @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-YCP@ +## Nasty hack: xgettext doesn't work for XML files, so let's symlink it +( cd control; ln -sf installation.xml installation.glade ) + +find control -name \*.glade | LC_ALL=C sort > POTFILES + ## and generate the output... @YAST2-OUTPUT@ Modified: branches/SuSE-Code-11-Branch/pos-installation/control/installation.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-installation/control/installation.xml?rev=57148&r1=57147&r2=57148&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/control/installation.xml (original) +++ branches/SuSE-Code-11-Branch/pos-installation/control/installation.xml Wed May 13 11:59:17 2009 @@ -44,7 +44,7 @@ yes </defaults> - <!-- First Stage - Installation --> + <!-- First Stage - Update --> <stage>initial</stage> <mode>update</mode> @@ -109,26 +109,49 @@ yes </defaults> - <!-- Second Stage - Update --> + <!-- Second Stage - Installation --> <stage>continue</stage> - <mode>update</mode> + <mode>installation</mode> + + <!-- replace service setup with new modules + <remove_modules config:type="list"> + <remove_module>continue_service_proposal</remove_module> + </remove_modules> + + <insert_modules config:type="list"> + <insert_module> + <before>suseconfig</before> + <modules config:type="list"> + <module> + <label>POS Setup</label> + <name>inst_slepos_detection</name> + </module> + <module> + <name>inst_slepos_server_selection</name> + </module> + <module> + <name>inst_slepos_migration</name> + </module> + </modules> + </insert_module> + </insert_modules> + --> - <!-- Update: Replace Services step --> <replace>continue_service_proposal</replace> - - + <modules config:type="list"> + <module> <label>POS Setup</label> <name>inst_slepos_detection</name> - - + </module> + <module> <name>inst_slepos_server_selection</name> - - + </module> + <module> <name>inst_slepos_migration</name> - - + </module> + </modules> </workflow> Modified: branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes?rev=57148&r1=57147&r2=57148&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes Wed May 13 11:59:17 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 13 11:52:44 CEST 2009 - jsuchome@suse.cz + +- correct syntax of replace_modules in installation.xml +- create control-SLEPOS.pot file from installation.xml strings +- 2.17.2 + +------------------------------------------------------------------- Tue May 12 07:58:36 CEST 2009 - jsuchome@suse.cz - rewritten for new installation and migration setup (fate#303644) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org