Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2014-06-17 11:22:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-06-01
18:55:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-06-17
11:22:40.000000000 +0200
@@ -1,0 +2,21 @@
+Fri Jun 6 08:25:22 CEST 2014 - snw...@suse.de
+
+- removed linuxrc-misc-fixes.patch
+- integrated latest changes
+- 4.2.32
+
+-------------------------------------------------------------------
+Thu Jun 5 20:51:48 UTC 2014 - mp...@suse.com
+
+- Added linuxrc-misc-fixes.patch (bnc#881342)
+ - Add back in check for "ctc"-named interfaces in check_ptp.
+ - Remove the sleep(3) workaround in net.c
+ - Add a call to udevadm settle in net.c
+
+-------------------------------------------------------------------
+Thu Jun 5 14:56:41 CEST 2014 - snw...@suse.de
+
+- s390x: wait 3s after loading qeth module
+- 4.2.31
+
+-------------------------------------------------------------------
Old:
----
linuxrc-4.2.30.tar.xz
New:
----
linuxrc-4.2.32.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.SELhbG/_old 2014-06-17 11:22:41.000000000 +0200
+++ /var/tmp/diff_new_pack.SELhbG/_new 2014-06-17 11:22:41.000000000 +0200
@@ -25,9 +25,9 @@
Summary: SUSE Installation Program
License: GPL-3.0+
Group: System/Boot
-Version: 4.2.30
+Version: 4.2.32
Release: 0
-Source: linuxrc-4.2.30.tar.xz
+Source: linuxrc-4.2.32.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ linuxrc-4.2.30.tar.xz -> linuxrc-4.2.32.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.2.30/VERSION new/linuxrc-4.2.32/VERSION
--- old/linuxrc-4.2.30/VERSION 2014-05-30 08:03:11.000000000 +0200
+++ new/linuxrc-4.2.32/VERSION 2014-06-06 08:25:17.000000000 +0200
@@ -1 +1 @@
-4.2.30
+4.2.32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.2.30/changelog new/linuxrc-4.2.32/changelog
--- old/linuxrc-4.2.30/changelog 2014-05-30 08:03:13.000000000 +0200
+++ new/linuxrc-4.2.32/changelog 2014-06-06 08:25:20.000000000 +0200
@@ -1,4 +1,10 @@
-2014-05-30: HEAD
+2014-06-06: HEAD
+ - fix s390x network setup properly (bnc #881342)
+
+2014-06-05: 4.2.31
+ - s390x: wait 3s after loading qeth module
+
+2014-05-30: 4.2.30
- Merge pull request #9 from openSUSE/bnc879893
- s390: choose thermonuclear option to deal with whitespace issues
- s390: choose thermonuclear option to deal with whitespace issues
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.2.30/net.c new/linuxrc-4.2.32/net.c
--- old/linuxrc-4.2.30/net.c 2014-05-21 15:53:44.000000000 +0200
+++ new/linuxrc-4.2.32/net.c 2014-06-06 08:19:37.000000000 +0200
@@ -2699,13 +2699,21 @@
return -1;
break;
}
+
rc = system(cmd);
if(rc) {
sprintf(cmd, "network configuration script failed (error code %d)", rc);
dia_message(cmd, MSGTYPE_ERROR);
return -1;
}
-
+
+ rc = system("/sbin/udevadm settle");
+ if(rc) {
+ sprintf(cmd, "udevadm settle failed (error code %d)", rc);
+ dia_message(cmd, MSGTYPE_ERROR);
+ return -1;
+ }
+
if(config.hwp.osahwaddr && strlen(config.hwp.osahwaddr) > 0) {
struct ifreq ifr;
struct ether_addr* ea;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.2.30/util.c new/linuxrc-4.2.32/util.c
--- old/linuxrc-4.2.30/util.c 2014-05-16 15:52:13.000000000 +0200
+++ new/linuxrc-4.2.32/util.c 2014-06-06 08:15:20.000000000 +0200
@@ -4715,6 +4715,7 @@
if(
!strncmp(config.net.device, "plip", sizeof "plip" - 1) ||
!strncmp(config.net.device, "iucv", sizeof "iucv" - 1) ||
+ !strncmp(config.net.device, "ctc", sizeof "ctc" - 1) ||
!strncmp(config.net.device, "sl", sizeof "sl" - 1)
) config.net.ptp = 1;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
