Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at 2012-10-11 11:35:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network", Maintainer is "mfi...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes
2012-09-06 09:08:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes
2012-10-11 11:38:39.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Oct 3 09:07:01 UTC 2012 - mfi...@suse.com
+
+- Autoenabling of all interfaces allowed during installation only.
+- fixes bnc#782283
+- 2.24.6
+
+-------------------------------------------------------------------
+Fri Sep 21 11:26:22 CEST 2012 - jsuch...@suse.cz
+
+- let curl follow redirects when downloading release notes package
+ (bnc#781330)
+- 2.24.5
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.24.4.tar.bz2
New:
----
yast2-network-2.24.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.koGXJY/_old 2012-10-11 11:38:42.000000000 +0200
+++ /var/tmp/diff_new_pack.koGXJY/_new 2012-10-11 11:38:42.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 2.24.4
+Version: 2.24.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -36,8 +36,9 @@
# NetworkInterfaces::Write should write ifcfgs only once
# Wizard::SetDesktopTitleAndIcon
# yast2 v2.23.0 - support for shel (un)quoting
+# yast2 v2.23.6 - updated API for IPv6
BuildRequires: yast2 >= 2.21.22
-Requires: yast2 >= 2.23.0
+Requires: yast2 >= 2.23.5
#netconfig (FaTE #303618)
Requires: sysconfig >= 0.71.2
++++++ yast2-network-2.24.4.tar.bz2 -> yast2-network-2.24.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.24.4/VERSION
new/yast2-network-2.24.6/VERSION
--- old/yast2-network-2.24.4/VERSION 2012-09-05 15:05:42.000000000 +0200
+++ new/yast2-network-2.24.6/VERSION 2012-10-03 11:06:49.000000000 +0200
@@ -1 +1 @@
-2.24.4
+2.24.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-2.24.4/src/installation/inst_do_net_test.ycp
new/yast2-network-2.24.6/src/installation/inst_do_net_test.ycp
--- old/yast2-network-2.24.4/src/installation/inst_do_net_test.ycp
2012-09-05 15:05:42.000000000 +0200
+++ new/yast2-network-2.24.6/src/installation/inst_do_net_test.ycp
2012-10-03 10:08:55.000000000 +0200
@@ -376,9 +376,10 @@
}
}
- //Include also proxy option (if applicable) - #162800, #260407
- string cmd = " /usr/bin/curl -s -S -v -f -m 300 " + proxy + " " +
url + " -o " + filename;
- cmd = cmd + " > " + logdir + "/" + log_filename + " 2>&1";
+ //Include also proxy option (if applicable) - #162800, #260407
+ string cmd = "/usr/bin/curl --location --verbose --fail --max-time
300 " +
+ sformat ("%1 %2 --output '%3' > '%4/%5' 2>&1",
+ proxy, url, String::Quote (filename), String::Quote (logdir),
String::Quote (log_filename));
// env["LANG"] = GetLanguageUTF8 ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.24.4/src/modules/Lan.ycp
new/yast2-network-2.24.6/src/modules/Lan.ycp
--- old/yast2-network-2.24.4/src/modules/Lan.ycp 2012-09-05
15:05:43.000000000 +0200
+++ new/yast2-network-2.24.6/src/modules/Lan.ycp 2012-10-03
11:29:23.000000000 +0200
@@ -102,7 +102,7 @@
* @return true if data was modified
*/
global boolean Modified() {
- boolean ret = LanItems::Modified() || DNS::modified ||
Routing::Modified() ||
+ boolean ret = LanItems::GetModified() || DNS::modified ||
Routing::Modified() ||
NetworkConfig::Modified();
return ret;
}
@@ -261,8 +261,14 @@
/* Progress step 2/9 */
if (gui) ProgressNextStage(_("Detecting network devices..."));
// Dont read hardware data in config mode
- if(!Mode::config ()) {
- if(!NetHwDetection::running) NetHwDetection::Start();
+ if(!Mode::config ())
+ {
+ NetHwDetection::Start();
+ }
+ // Start interfaces iff running installation. See bnc#395014 and bnc#782283
+ if( Mode::installation())
+ {
+ SetAllLinksUp();
}
sleep(sl);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.24.4/src/modules/LanItems.ycp
new/yast2-network-2.24.6/src/modules/LanItems.ycp
--- old/yast2-network-2.24.4/src/modules/LanItems.ycp 2012-09-05
15:05:43.000000000 +0200
+++ new/yast2-network-2.24.6/src/modules/LanItems.ycp 2012-10-03
10:59:17.000000000 +0200
@@ -321,15 +321,6 @@
}
/**
- * Data was modified?
- * @return true if modified
- */
-global define boolean Modified() {
- y2debug("modified=%1",modified);
- return modified;
-}
-
-/**
* Function which returns if the settings were modified
* @return boolean settings were modified
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.24.4/src/modules/NetHwDetection.ycp
new/yast2-network-2.24.6/src/modules/NetHwDetection.ycp
--- old/yast2-network-2.24.4/src/modules/NetHwDetection.ycp 2012-09-05
15:05:43.000000000 +0200
+++ new/yast2-network-2.24.6/src/modules/NetHwDetection.ycp 2012-10-03
11:00:59.000000000 +0200
@@ -78,7 +78,7 @@
* WATCH OUT, this is the place where modules are loaded
* @return true if success
*/
-define boolean StartEthInterface() {
+define boolean LoadNetModules() {
y2milestone("Network detection prepare");
@@ -114,29 +114,11 @@
SCR::Execute (.target.bash, sformat ("/sbin/modprobe --use-blacklist %1
2>&1", mod));
});
-
- string command = "ls /sys/class/net|grep -v \"^lo$\"";
- map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output,
command);
- if (output["exit"]:-1==0){
- list<string> interfaces = filter(string s, splitstring(output["stdout"]:"",
"\n"), {return (size(s)>0);});
- y2milestone("interfaces %1", interfaces);
- foreach(string ifc, interfaces, {
-// TODO: do some tests before uncomment block bellow
-// if ((integer)SCR::Execute(.target.bash, sformat("ip link show %1|head
-n1|grep -q \"[^[:alpha:]]UP[^[:alpha:]]\"", ifc))!=0)
-// {
- y2milestone("Setting link up for interface %1", ifc);
- SCR::Execute(.target.bash, sformat("ip link set %1 up", ifc));
-// } else y2milestone("Link for %1 interface is already up, nothing to do",
ifc);
- });
- } else y2error("Error while execute %1 : %2", command, output);
-
y2milestone("Network detection prepare (end)");
+
return true;
}
-
-
-
/**
* Start the detection
* @return true on success
@@ -149,7 +131,7 @@
y2milestone("IFCONFIG1: %1", SCR::Execute(.target.bash_output, "/sbin/ip addr
show"));
boolean ret = false;
- if(StartEthInterface()) {
+ if( LoadNetModules()) {
running = true;
ret = true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-2.24.4/src/routines/routines.ycp
new/yast2-network-2.24.6/src/routines/routines.ycp
--- old/yast2-network-2.24.4/src/routines/routines.ycp 2012-09-05
15:05:43.000000000 +0200
+++ new/yast2-network-2.24.6/src/routines/routines.ycp 2012-10-03
11:00:59.000000000 +0200
@@ -772,6 +772,33 @@
return Hardware;
}
+define boolean SetAllLinksUp()
+{
+ string command = "ls /sys/class/net|grep -v \"^lo$\"";
+ map<string, any> output = (map<string,
any>)SCR::Execute(.target.bash_output, command);
+
+ if (output["exit"]:-1==0)
+ {
+ list<string> interfaces = filter(string s,
splitstring(output["stdout"]:"", "\n"), {return (size(s)>0);});
+
+ y2milestone("interfaces %1", interfaces);
+
+ foreach(string ifc, interfaces,
+ {
+// TODO: do some tests before uncomment block bellow
+// if ((integer)SCR::Execute(.target.bash, sformat("ip link show %1|head
-n1|grep -q \"[^[:alpha:]]UP[^[:alpha:]]\"", ifc))!=0)
+// {
+ y2milestone("Setting link up for interface %1", ifc);
+ SCR::Execute(.target.bash, sformat("ip link set %1 up", ifc));
+// } else y2milestone("Link for %1 interface is already up, nothing to do",
ifc);
+ });
+ }
+ else
+ y2error("Error while execute %1 : %2", command, output);
+
+ return true;
+}
+
boolean validPrefixOrNetmask(string ip, string mask){
boolean valid_mask=false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-2.24.4/testsuite/tests/Network_YaPI.out
new/yast2-network-2.24.6/testsuite/tests/Network_YaPI.out
--- old/yast2-network-2.24.4/testsuite/tests/Network_YaPI.out 2012-09-05
15:05:43.000000000 +0200
+++ new/yast2-network-2.24.6/testsuite/tests/Network_YaPI.out 2012-10-03
11:00:08.000000000 +0200
@@ -88,7 +88,7 @@
Execute .target.bash "/bin/cp /etc/sysconfig/network/routes
/etc/sysconfig/network/routes.YaST2save" 0
Write .routes [$["destination":"default", "device":"-",
"gateway":"10.20.30.40", "netmask":"-"]] true
Return $["error":"", "exit":"0"]
-Return $["error":"A valid IP address consists of four integers\nin the range
0-255 separated by dots.", "exit":"-1"]
+Return $["error":"A valid IPv4 address consists of four integers\nin the range
0-255 separated by dots.", "exit":"-1"]
Write .network.value."eth3".BOOTPROTO "static" true
Write .network.value."eth3".IPADDR "1.2.3.7/24" true
Write .network.value."eth3".STARTMODE "auto" true
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
