Author: ug Date: Tue Jan 15 17:03:53 2008 New Revision: 43624 URL: http://svn.opensuse.org/viewcvs/yast?rev=43624&view=rev Log: the 'path' for an ask-question can be in a list now to change multiple elements in the profile Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/ask.ycp trunk/autoinstallation/src/include/xml.ycp Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfileDetails.xml?rev=43624&r1=43623&r2=43624&view=diff ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Tue Jan 15 17:03:53 2008 @@ -1276,54 +1276,6 @@ </para> </section> - <section> - <title> - Custom Package Selections - </title> - <para> - In addition to the pre-defined selections, you can create custom selections - by providing a selection file in the selection - directory. (<filename>suse/setup/descr</filename>) The selection files have a special format and any - additional selection file must conform to this format, otherwise - &yast2; will not be able to read it. - </para> - <para> - As an example for the selection file, take a look at the files - available in the directory <filename>/suse/setup/descr/</filename> on - the CD-ROMs. - </para> - <para> - After creating a selection file, you can add it to the configuration - as described earlier in this section. The selection name, for example - <emphasis>My.sel</emphasis> has to be added to the index files - <filename>selections</filename> and <filename>directory.yast</filename> - to make it visible to the installer. - </para> - <para> - The file <filename>My.sel</filename> should have the following format: - </para> - <example> - <title> - Customized Package selection - </title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> - </example> - <para>To use the above selection, the following should be added in the - control file:</para> - <example> - <title> - Package selection file - </title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> - </example> - - </section> <section> <title> Installing additional and customized Packages @@ -2555,6 +2507,12 @@ <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry> </row> <row> + <entry>pathlist (available since openSUSE 11.0)</entry> + <entry>a list of <emphasis>path</emphasis> elements (see above) + <para><screen><pathlist><path>networking,dns,hostname</path><path>...</path></screen></para></entry> + <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry> + </row> + <row> <entry>file (available since SLES10 SP1 and SL 10.2)</entry> <entry>you can store the answer to a question in a file, to use it in one of your scripts later. <para><screen><file>/tmp/answer_hostname</file></screen></para></entry> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=43624&r1=43623&r2=43624&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Jan 15 17:03:53 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 15 17:01:53 CET 2008 - ug@suse.de + +- the "path" for an ask-question can be in a list now to + change multiple elements in the profile + +------------------------------------------------------------------- Mon Jan 14 15:06:13 CET 2008 - ug@suse.de - default for missing fixed Modified: trunk/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask.ycp?rev=43624&r1=43623&r2=43624&view=diff ============================================================================== --- trunk/autoinstallation/src/dialogs/ask.ycp (original) +++ trunk/autoinstallation/src/dialogs/ask.ycp Tue Jan 15 17:03:53 2008 @@ -15,6 +15,19 @@ import "Stage"; import "Popup"; + define list<any> path2pos( string pa ) { + list<any> pos = []; + foreach( string p, splitstring( pa, "," ), ``{ + if( regexpmatch( p, "^[1,2,3,4,5,6,7,8,9,0]+$" ) ) { + integer index = tointeger(p); + pos = add(pos, index); + } else { + pos = add(pos, p); + } + }); + return pos; + } + define boolean askDialog() { boolean mod = false; @@ -142,7 +155,6 @@ integer runAgain = 0; integer element_cnt = 0; foreach( map ask, (list<map>)dialogs[dialog_nr]:[], ``{ - list<string> position = splitstring( ask["path"]:"", "," ); string file = ask["file"]:""; map script = ask["script"]:$[]; string entry_id = sformat("%1_%2",dialog_nr, ask["element"]:element_cnt); @@ -159,17 +171,15 @@ } } y2milestone("question=%1 was answered with val=%2",ask["question"]:"", val); - list<any> pos = []; - foreach( string p, position, ``{ - if( regexpmatch( p, "^[1,2,3,4,5,6,7,8,9,0]+$" ) ) { - integer index = tointeger(p); - pos = add(pos, index); - } else { - pos = add(pos, p); - } - }); + list<any> pos = path2pos( ask["path"]:"" ); if( ask["path"]:"" != "" ) Profile::current = Profile::setElementByList( pos, val, Profile::current ); + + foreach( string p, ask["pathlist"]:[], ``{ + list<any> pos = path2pos( p ); + Profile::current = Profile::setElementByList( pos, val, Profile::current ); + }); + if( file != "" ) { if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) y2milestone("writing answer to %1 failed",file); Modified: trunk/autoinstallation/src/include/xml.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/xml.ycp?rev=43624&r1=43623&r2=43624&view=diff ============================================================================== --- trunk/autoinstallation/src/include/xml.ycp (original) +++ trunk/autoinstallation/src/include/xml.ycp Tue Jan 15 17:03:53 2008 @@ -92,7 +92,8 @@ "smtp_auth":"smtp_auth_entry", "patterns":"pattern", "dont_merge":"element", - "keys":"keyid" + "keys":"keyid", + "pathlist":"path" ]; doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config"]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org