diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-08 15:53:56 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-08 15:53:56 +0200 |
| commit | da323858ef34a0216aa96f4089810053c90f09ce (patch) | |
| tree | 6255edf3ad93f2ce0cee28856ec3de90915caccd /src/network | |
| parent | 4211d5bd135ae4c43bd2012ae5f327b1cc1596c0 (diff) | |
| parent | 75f86906c52735c98dc0aa7e24b773edb42ee814 (diff) | |
Merge pull request #1190 from poettering/rework-virt
basic: rework virtualization detection API
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-link.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-manager.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 1dc9db0fca..9d4a69b0db 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2152,7 +2152,7 @@ int link_add(Manager *m, sd_netlink_message *message, Link **ret) { log_link_debug(link, "Link %d added", link->ifindex); - if (detect_container(NULL) <= 0) { + if (detect_container() <= 0) { /* not in a container, udev will be around */ sprintf(ifindex_str, "n%d", link->ifindex); device = udev_device_new_from_device_id(m->udev, ifindex_str); diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 92b607297d..b4259cafef 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -241,7 +241,7 @@ static int manager_connect_udev(Manager *m) { /* udev does not initialize devices inside containers, * so we rely on them being already initialized before * entering the container */ - if (detect_container(NULL) > 0) + if (detect_container() > 0) return 0; m->udev = udev_new(); |