diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-09-17 17:42:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 17:42:26 +0000 |
| commit | 59a224d7282e2605f1c6e45a588119263574267f (patch) | |
| tree | 7d1cf270ee4f5bbd616811cd9fe307d2b59f57ff | |
| parent | 404ca5560b59219733bddad758637840925d8cee (diff) | |
| parent | 4d59e14f321d50cbdec1a2ef702e2d258e377356 (diff) | |
| download | systemd-59a224d7282e2605f1c6e45a588119263574267f.tar.gz | |
Merge pull request #13577 from yuwata/network-fix-ci-failure
network: fix CI failure
| -rw-r--r-- | src/network/networkd-link.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index da1d406618..be7e311e9f 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2393,9 +2393,9 @@ static int link_drop_foreign_config(Link *link) { continue; if (link_address_is_dynamic(link, address)) { - if (FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP)) + if (link->network && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP)) continue; - } else if (FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_STATIC)) + } else if (link->network && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_STATIC)) continue; if (link_is_static_address_configured(link, address)) { @@ -2435,11 +2435,11 @@ static int link_drop_foreign_config(Link *link) { in_addr_equal(AF_INET6, &route->dst, &(union in_addr_union) { .in6 = {{{ 0xff,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 }}} })) continue; - if (route->protocol == RTPROT_STATIC && + if (route->protocol == RTPROT_STATIC && link->network && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_STATIC)) continue; - if (route->protocol == RTPROT_DHCP && + if (route->protocol == RTPROT_DHCP && link->network && FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP)) continue; @@ -3115,8 +3115,8 @@ int link_add(Manager *m, sd_netlink_message *message, Link **ret) { sprintf(ifindex_str, "n%d", link->ifindex); r = sd_device_new_from_device_id(&device, ifindex_str); if (r < 0) { - log_link_warning_errno(link, r, "Could not find device: %m"); - goto failed; + log_link_warning_errno(link, r, "Could not find device, waiting for device initialization: %m"); + return 0; } r = sd_device_get_is_initialized(device); |