Mailinglist Archive: yast-commit (62 mails)

< Previous Next >
[yast-commit] r62470 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/clients/save_network.ycp src/lan/YaPI/NETWORK.pm src/modules/Proxy.ycp
  • From: mzugec@xxxxxxxxxxxxxxxxx
  • Date: Fri, 03 Sep 2010 13:32:37 -0000
  • Message-id: <20100903133237.D70553237A@xxxxxxxxxxxxxxxxx>
Author: mzugec
Date: Fri Sep 3 15:32:35 2010
New Revision: 62470

URL: http://svn.opensuse.org/viewcvs/yast?rev=62470&view=rev
Log:
- Proxy: correctly enclose user:password into quotes (bnc#616695)
- YaPI: static hostname with DHCP (bnc#624655)
- fixed network in 2nd stage of installation (bnc#628762)


Modified:
branches/SuSE-Code-11-Branch/network/VERSION
branches/SuSE-Code-11-Branch/network/package/yast2-network.changes
branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp
branches/SuSE-Code-11-Branch/network/src/lan/YaPI/NETWORK.pm
branches/SuSE-Code-11-Branch/network/src/modules/Proxy.ycp

Modified: branches/SuSE-Code-11-Branch/network/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/VERSION?rev=62470&r1=62469&r2=62470&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/network/VERSION (original)
+++ branches/SuSE-Code-11-Branch/network/VERSION Fri Sep 3 15:32:35 2010
@@ -1 +1 @@
-2.17.78.2
+2.17.78.3

Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/package/yast2-network.changes?rev=62470&r1=62469&r2=62470&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes
(original)
+++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Fri Sep
3 15:32:35 2010
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Sep 3 15:29:37 CEST 2010 - mzugec@xxxxxxx
+
+- Proxy: correctly enclose user:password into quotes (bnc#616695)
+- YaPI: static hostname with DHCP (bnc#624655)
+- fixed network in 2nd stage of installation (bnc#628762)
+- 2.17.78.3
+
+-------------------------------------------------------------------
Wed Dec 9 10:48:36 CET 2009 - mzugec@xxxxxxx

- ISDN: fixed creating configuration with incorrect name (bnc#534504)

Modified: branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp?rev=62470&r1=62469&r2=62470&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp (original)
+++ branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Fri Sep
3 15:32:35 2010
@@ -32,6 +32,7 @@

// global variable because chrooted environment
boolean network_disk=false;
+string netdevice="";

/**
* Read one install.inf item
@@ -113,7 +114,7 @@


/* Split network device */
- string netdevice = InstallInf["netdevice"]:"";
+ netdevice = InstallInf["netdevice"]:"";
if(netdevice != "") {
string devtype = NetworkInterfaces::device_type(netdevice);
if(devtype != nil && devtype != "") InstallInf["type"] = devtype;

Modified: branches/SuSE-Code-11-Branch/network/src/lan/YaPI/NETWORK.pm
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/lan/YaPI/NETWORK.pm?rev=62470&r1=62469&r2=62470&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/network/src/lan/YaPI/NETWORK.pm (original)
+++ branches/SuSE-Code-11-Branch/network/src/lan/YaPI/NETWORK.pm Fri Sep 3
15:32:35 2010
@@ -52,7 +52,8 @@
my %ret = ('interfaces'=>\%interfaces,
'routes'=>{'default'=>{'via'=>Routing->GetGateway()}},
'dns'=>{'nameservers'=>\@{DNS->nameservers},
'searches'=>\@{DNS->searchlist}},
- 'hostname'=>{'name'=>Hostname->CurrentHostname,
'domain'=>Hostname->CurrentDomain}
+ 'hostname'=>{'name'=>Hostname->CurrentHostname,
'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname}
+# 'hostname'=>{'name'=>Hostname->CurrentHostname,
'domain'=>Hostname->CurrentDomain}
);
return \%ret;
}
@@ -96,6 +97,7 @@
DNS->Read();
DNS->hostname($args->{'hostname'}->{'name'});
DNS->domain($args->{'hostname'}->{'domain'});
+ DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined
$args->{'hostname'}->{'dhcp_hostname'});
DNS->modified(1);
DNS->Write();
return $ret;

Modified: branches/SuSE-Code-11-Branch/network/src/modules/Proxy.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/src/modules/Proxy.ycp?rev=62470&r1=62469&r2=62470&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/network/src/modules/Proxy.ycp (original)
+++ branches/SuSE-Code-11-Branch/network/src/modules/Proxy.ycp Fri Sep 3
15:32:35 2010
@@ -257,10 +257,10 @@
proxy_password = mergestring (splitstring(proxy_password, "\""),
"\\\"");

string user_pass = (proxy_user != "" ?
- " --proxy-user " + proxy_user + (proxy_password != "" ?
+ " --proxy-user '" + proxy_user + (proxy_password != "" ?
":" + proxy_password
:
- "")
+ "") + "'"
:
"");

@@ -268,7 +268,7 @@
integer timeout_sec = 90;
// %1 = http or ftp proxy, %2 = user:password if any, %3 = URL
// enclose user:password into quotes, it may contain special characters
(#338264)
- string command = "curl --verbose --proxy %1 '%2' --connect-timeout %3
--url %4";
+ string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url
%4";
string http_command = sformat(command, http_proxy, user_pass, timeout_sec,
"http://www.novell.com";);
// adding option --insecure to accept the certificate without asking
string https_command = sformat(command, https_proxy, user_pass,
timeout_sec, "https://secure-www.novell.com --insecure");

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages