From d7dbf74ce5264f3384490ca07fdbb87faa9fc058905c8dbaf526deb34e4f86dd Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 29 Aug 2014 14:51:38 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=762 --- 0001-nspawn-fix-network-interface.patch | 21 +++++++++++++++++++++ systemd-mini.changes | 6 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 6 ++++++ systemd.spec | 3 +++ 5 files changed, 39 insertions(+) create mode 100644 0001-nspawn-fix-network-interface.patch diff --git a/0001-nspawn-fix-network-interface.patch b/0001-nspawn-fix-network-interface.patch new file mode 100644 index 00000000..6e9fce7c --- /dev/null +++ b/0001-nspawn-fix-network-interface.patch @@ -0,0 +1,21 @@ +Based on 3125b3ef5db70d45882c7d6f617705802c5f939e Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +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; diff --git a/systemd-mini.changes b/systemd-mini.changes index 28287a59..95a37355 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -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 diff --git a/systemd-mini.spec b/systemd-mini.spec index 991e05e4..dc545d79 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -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 diff --git a/systemd.changes b/systemd.changes index 28287a59..95a37355 100644 --- a/systemd.changes +++ b/systemd.changes @@ -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 diff --git a/systemd.spec b/systemd.spec index 479cc115..f28ff8d6 100644 --- a/systemd.spec +++ b/systemd.spec @@ -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