diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 713a3aad93..61d678f7d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1849,6 +1849,7 @@ systemd_nspawn_LDADD = \ libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ + libudev-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 689592ed73..abcee3fb98 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -73,6 +73,7 @@ #include "env-util.h" #include "def.h" #include "rtnl-util.h" +#include "udev-util.h" typedef enum LinkJournal { LINK_NO, @@ -1256,6 +1257,7 @@ static int reset_audit_loginuid(void) { static int move_network_interfaces(pid_t pid) { _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; + _cleanup_udev_unref_ struct udev *udev = NULL; char **i; int r; @@ -1271,8 +1273,16 @@ static int move_network_interfaces(pid_t pid) { return r; } + udev = udev_new(); + if (!udev) { + log_error("Failed to connect to udev."); + return -ENOMEM; + } + STRV_FOREACH(i, arg_network_interfaces) { _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + char ifi_str[2 + DECIMAL_STR_MAX(int)]; int ifi; ifi = (int) if_nametoindex(*i); @@ -1281,6 +1291,18 @@ static int move_network_interfaces(pid_t pid) { return -errno; } + sprintf(ifi_str, "n%i", ifi); + d = udev_device_new_from_device_id(udev, ifi_str); + if (!d) { + log_error("Failed to get udev device for interface %s: %m", *i); + return -errno; + } + + if (udev_device_get_is_initialized(d) <= 0) { + log_error("Network interface %s is not initialized yet.", *i); + return -EBUSY; + } + r = sd_rtnl_message_new_link(RTM_NEWLINK, ifi, &m); if (r < 0) { log_error("Failed to allocate netlink message: %s", strerror(-r)); |