diff options
| author | Susant Sahani <susant@redhat.com> | 2018-06-08 14:32:21 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-06-08 16:09:19 +0200 |
| commit | 194c03c839b23261d005d3b3a8ab197be53492a7 (patch) | |
| tree | 2e085c171dccbb1c6c75dc2b29fa82463d372554 /src/network | |
| parent | analyze: use _cleanup_ for struct unit_times (diff) | |
| download | systemd-194c03c839b23261d005d3b3a8ab197be53492a7.tar.xz systemd-194c03c839b23261d005d3b3a8ab197be53492a7.zip | |
networkd: tunnel ignore wrong conf rather than assert
Closes #9234
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/netdev/tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 496407ef22..2589ea13f4 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -401,10 +401,10 @@ static int netdev_tunnel_verify(NetDev *netdev, const char *filename) { return -EINVAL; } - if (netdev->kind == NETDEV_KIND_VTI && + if (IN_SET(netdev->kind, NETDEV_KIND_VTI, NETDEV_KIND_IPIP, NETDEV_KIND_GRE, NETDEV_KIND_GRETAP) && (t->family != AF_INET || in_addr_is_null(t->family, &t->local))) { log_netdev_error(netdev, - "vti tunnel without a local IPv4 address configured in %s. Ignoring", filename); + "vti/ipip/gre/gretap tunnel without a local IPv4 address configured in %s. Ignoring", filename); return -EINVAL; } |