summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-08-28 12:15:51 +0200
committerTom Gundersen <teg@jklm.no>2014-08-28 12:16:07 +0200
commit3125b3ef5db70d45882c7d6f617705802c5f939e (patch)
treebf70511a82fa7dea0d3d8e71960882f8423dc367
parent371ad55d460559b4262e25d0f9b64dc37c3f7565 (diff)
nspawn: fix --network-interface
Use SETLINK when modifying an existing link.
-rw-r--r--TODO2
-rw-r--r--src/nspawn/nspawn.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/TODO b/TODO
index bc81a70eb1..a00c13dab2 100644
--- a/TODO
+++ b/TODO
@@ -24,8 +24,6 @@ External:
Features:
-* nspawn --network-interface= doesn't work...
-
* dbus: add new message hdr field for allowing interactive auth, write spec for it. update dbus spec to mandate that unknown flags *must* be ignored...
* maybe introduce AssertXYZ= similar to ConditionXYZ= that causes a unit to fail (instead of skipping it) if some condition is not true...
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 56d9cc68c6..5af89c9b32 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1886,7 +1886,7 @@ static int move_network_interfaces(pid_t pid) {
if (ifi < 0)
return ifi;
- 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;