dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=762
This commit is contained in:
Dr. Werner Fink 2014-08-29 14:51:38 +00:00 committed by Git OBS Bridge
parent 8beafef6c8
commit dbdf0516e5
5 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
0001-nspawn-fix-network-interface.patch Normal file
View File

@ -0,0 +1,21 @@
Based on 3125b3ef5db70d45882c7d6f617705802c5f939e Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Thu, 28 Aug 2014 12:15:51 +0200
Subject: [PATCH] nspawn: fix --network-interface
Use SETLINK when modifying an existing link.
---
src/nspawn/nspawn.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- src/nspawn/nspawn.c
+++ src/nspawn/nspawn.c 2014-08-29 14:11:25.866235309 +0000
@@ -1568,7 +1568,7 @@ static int move_network_interfaces(pid_t
return -EBUSY;
}
- r = sd_rtnl_message_new_link(rtnl, &m, RTM_NEWLINK, ifi);
+ r = sd_rtnl_message_new_link(rtnl, &m, RTM_SETLINK, ifi);
if (r < 0) {
log_error("Failed to allocate netlink message: %s", strerror(-r));
return r;

6
systemd-mini.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 29 14:14:06 UTC 2014 - werner@suse.de
- Add upstream patch 0001-nspawn-fix-network-interface.patch to
make option network-interface of systemd-nspawn work
-------------------------------------------------------------------
Thu Aug 28 10:07:10 UTC 2014 - werner@suse.de

3
systemd-mini.spec
View File

@ -814,6 +814,8 @@ Patch391: 0002-util-fix-minimal-race-where-we-might-miss-SIGTERMs-w.patch
Patch392: 0003-sd-journal-properly-convert-object-size-on-big-endia.patch
# PATCH-FIX-UPSTREAM added at 2014/08/28
Patch393: 0004-sd-journal-verify-that-object-start-with-the-field-n.patch
# PATCH-FIX-UPSTREAM added at 2014/08/29
Patch394: 0001-nspawn-fix-network-interface.patch
# UDEV PATCHES
# ============
@ -1501,6 +1503,7 @@ cp %{SOURCE7} m4/
%patch391 -p0
%patch392 -p0
%patch393 -p0
%patch394 -p0
# udev patches
%patch1001 -p1

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 29 14:14:06 UTC 2014 - werner@suse.de
- Add upstream patch 0001-nspawn-fix-network-interface.patch to
make option network-interface of systemd-nspawn work
-------------------------------------------------------------------
Thu Aug 28 10:07:10 UTC 2014 - werner@suse.de

3
systemd.spec
View File

@ -809,6 +809,8 @@ Patch391: 0002-util-fix-minimal-race-where-we-might-miss-SIGTERMs-w.patch
Patch392: 0003-sd-journal-properly-convert-object-size-on-big-endia.patch
# PATCH-FIX-UPSTREAM added at 2014/08/28
Patch393: 0004-sd-journal-verify-that-object-start-with-the-field-n.patch
# PATCH-FIX-UPSTREAM added at 2014/08/29
Patch394: 0001-nspawn-fix-network-interface.patch
# UDEV PATCHES
# ============
@ -1496,6 +1498,7 @@ cp %{SOURCE7} m4/
%patch391 -p0
%patch392 -p0
%patch393 -p0
%patch394 -p0
# udev patches
%patch1001 -p1