Author: ug Date: Wed Feb 4 15:59:37 2009 New Revision: 55254 URL: http://svn.opensuse.org/viewcvs/yast?rev=55254&view=rev Log: SLP support added Modified: trunk/autoinstallation/doc/Installation.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstConfig.ycp trunk/autoinstallation/src/modules/Profile.ycp Modified: trunk/autoinstallation/doc/Installation.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Installation.xml?rev=55254&r1=55253&r2=55254&view=diff ============================================================================== --- trunk/autoinstallation/doc/Installation.xml (original) +++ trunk/autoinstallation/doc/Installation.xml Wed Feb 4 15:59:37 2009 @@ -388,6 +388,10 @@ <entry>autoyast=relurl://<path> (since openSUSE 11.0)</entry> <entry>Retrieve the control file from the installation source (install=....)</entry> </row> + <row> + <entry>autoyast=slp (since openSUSE 11.2, not SLES 11)</entry> + <entry>Query the location of the profile from an SLP server (service:autoyast:...)</entry> + </row> </tbody> </tgroup> </table> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=55254&r1=55253&r2=55254&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Feb 4 15:59:37 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 4 15:58:32 CET 2009 - ug@suse.de + +- SLP support added (fate#305827) + +------------------------------------------------------------------- Mon Jan 26 14:41:16 CET 2009 - ug@suse.de - label on back/ok button is ask-dialogs can be specified Modified: trunk/autoinstallation/src/modules/AutoinstConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstConfig.ycp?rev=55254&r1=55253&r2=55254&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstConfig.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstConfig.ycp Wed Feb 4 15:59:37 2009 @@ -14,6 +14,7 @@ import "Mode"; import "Installation"; import "URL"; + import "SLP"; include "autoinstall/xml.ycp"; @@ -199,13 +200,28 @@ if (size(autoinstall) > 0 ) { cmdLine = autoinstall; - if (cmdLine == "default") - { + if (cmdLine == "default") { result["scheme"] = "file"; result["path"] = "/autoinst.xml"; - } - else - { + } else { + if( cmdLine == "slp" ) { + list<map> slpData = SLP::FindSrvs( "autoyast", ""); + if( size(slpData) > 1 ) { + list<any> dummy = []; + foreach( map m, slpData, ``{ + dummy = add( dummy, `item( substring( m["srvurl"]:"", 17), false) ); + }); + term dlg = `Left( `ComboBox( `id(`choose), "Choose Profile", dummy ) ); + UI::OpenDialog( `VBox( dlg, `PushButton(`id(`ok), "Ok" )) ); + UI::UserInput(); + cmdLine = (string)UI::QueryWidget(`id(`choose), `Value); + UI::CloseDialog (); + } else if( size(slpData) == 1 ) { + cmdLine = substring( slpData[0,"srvurl"]:"", 17); + } else { + cmdLine = "slp query for 'autoyast' failed"; + } + } result = URL::Parse (cmdLine); OriginalURI = cmdLine; } Modified: trunk/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Profile.ycp?rev=55254&r1=55253&r2=55254&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/Profile.ycp (original) +++ trunk/autoinstallation/src/modules/Profile.ycp Wed Feb 4 15:59:37 2009 @@ -115,7 +115,7 @@ } /* without autoyast2, does not work */ - if( haskey( current, "files" ) ) + if( haskey( current, "files" ) && !contains(current["software","packages"]:[], "autoyast2") ) current["software","packages"] = add( current["software","packages"]:[], "autoyast2" ); /* workaround for missing "REQUIRES" in content file to stay backward compatible */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org