Author: ug Date: Wed Aug 15 14:14:15 2007 New Revision: 40291 URL: http://svn.opensuse.org/viewcvs/yast?rev=40291&view=rev Log: fix for the support of the new "keep install network" feature of 10.3. 2.15.14 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/ayast_setup.ycp trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=40291&r1=40290&r2=40291&view=diff ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Aug 15 14:14:15 2007 @@ -1 +1 @@ -2.15.13 +2.15.14 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=40291&r1=40290&r2=40291&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Aug 15 14:14:15 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 15 14:12:22 CEST 2007 - ug@suse.de + +- fix for the support of the new "keep install network" + feature of 10.3 +- 2.15.14 + +------------------------------------------------------------------- Tue Aug 7 16:39:35 CEST 2007 - ug@suse.de - no frame if no frametitle is defined in ask-questions Modified: trunk/autoinstallation/src/clients/ayast_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ayast_setup.ycp?rev=40291&r1=40290&r2=40291&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/ayast_setup.ycp (original) +++ trunk/autoinstallation/src/clients/ayast_setup.ycp Wed Aug 15 14:14:15 2007 @@ -8,7 +8,9 @@ 0.2: * added Pkg::TargetInit 0.3: * support for <post-packages> 0.4: * support for the <ask> feature - * Version: 0.4 + 0.5: * support for the new "keep install network" + feature of 10.3 + * Version: 0.5 * $Id$ this client can be called from a running system, @@ -94,6 +96,13 @@ Stage::Set ("continue"); WFM::CallFunction("inst_autopost", []); AutoinstSoftware::addPostPackages(Profile::current["software","post-packages"]:[]); + + // the following is needed since 10.3 + // otherwise the already configured network gets removed + if( !haskey(Profile::current, "networking") ) { + Profile::current = add( Profile::current, "networking", $[ "keep_install_network":true ] ); + } + Pkg::TargetInit ("/", false); WFM::CallFunction("inst_rpmcopy", []); WFM::CallFunction("inst_autoconfigure", []); Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/inst_autoconfigure.ycp?rev=40291&r1=40290&r2=40291&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Wed Aug 15 14:14:15 2007 @@ -40,6 +40,16 @@ }; + define void removeNetwork() { + any l = SCR::Read (.target.dir, ["/etc/sysconfig/network", [] ]); + foreach( string s, (list<string>)l, ``{ + if( issubstring( s, "ifcfg-" ) && !issubstring( s, "ifcfg-lo" ) ) { + y2milestone("removing installation network: /etc/sysconfig/network/%1",s); + SCR::Execute(.target.remove, sformat("/etc/sysconfig/network/%1",s) ); + } + }); + return; + } // Help text for last dialog of base installation string help_text = _("<p> @@ -77,6 +87,13 @@ y2milestone("Order: %1", maplist(map d, deps, ``(d["res"]:""))); + if (!haskey(Profile::current , "networking") ) { + // FIXME: ayast_setup needs an exception + removeNetwork(); // no networking section -> no network + } else if( Profile::current["networking","keep_install_network"]:false == false ) { + removeNetwork(); // networking section without keeping the install network + } + foreach(map r, deps, ``{ string p = r["res"]:""; @@ -102,13 +119,6 @@ module_auto = sformat("%1_auto", p); map result = $[]; - /* remove the installation network */ - any l = SCR::Read (.target.dir, ["/etc/sysconfig/network", [] ]); - foreach( string s, (list<string>)l, ``{ - if( issubstring( s, "ifcfg-" ) && !issubstring( s, "ifcfg-lo" ) ) { - SCR::Execute(.target.remove, sformat("/etc/sysconfig/network/%1",s) ); - } - }); if (haskey(Profile::current , resource) ) { y2milestone("Writing configuration for %1", p); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org