Author: mfilka Date: Mon Feb 27 10:41:30 2012 New Revision: 67544 URL: http://svn.opensuse.org/viewcvs/yast?rev=67544&view=rev Log: installer's proxy config stored on installed system Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67544&r1=67543&r2=67544&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Feb 27 10:41:30 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=67544&r1=67543&r2=67544&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Feb 27 10:41:30 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 27 09:38:49 UTC 2012 - mfilka@suse.com + +- installer's proxy config stored on installed system - bnc#693640 +- 2.22.4 + +------------------------------------------------------------------- Thu Feb 23 08:52:06 UTC 2012 - mfilka@suse.com - added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582 Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=67544&r1=67543&r2=67544&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Mon Feb 27 10:41:30 2012 @@ -130,7 +130,8 @@ ReadInstallInfItem(install_inf, "nisdomain", "NISDomain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); - ReadInstallInfItem(install_inf, "proxy", "Proxy"); + ReadInstallInfItem(install_inf, "proxyUrl", "ProxyUrl"); + ReadInstallInfItem(install_inf, "proxyProto", "ProxyProto"); // ReadInstallInfItem(install_inf, "options", "Options"); // OSAHwAddr parameter s390 ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); @@ -439,12 +440,22 @@ } // create proxy sysconfig file - if (size(InstallInf["proxy"]:"")>0) { - y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:""); - map ex = Proxy::Export(); + if( (size(InstallInf["proxyProto"]:"")>0) && + (size( InstallInf["proxyUrl"]:"") >0) ) { + y2milestone("Writing proxy settings: %1", InstallInf["proxyUrl"]:""); + Proxy::Read(); + map ex = Proxy::Export(); + + // bnc#693640 - update Proxy module's configuration + // username and password is stored in url because it is handled by linuxrc this way and it is impossible + // to distinguish how the user inserted it (separate or as a part of url?) + ex[ InstallInf[ "proxyProto"]:"" + "_proxy"] = InstallInf[ "proxyUrl"]:""; + Proxy::Import( ex ); Proxy::Write(); + + y2debug( "Written proxy settings: %1", ex); } // create defaultdomain if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org