From 194c03c839b23261d005d3b3a8ab197be53492a7 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Fri, 8 Jun 2018 18:02:21 +0530 Subject: [PATCH] networkd: tunnel ignore wrong conf rather than assert Closes #9234 --- src/network/netdev/tunnel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 496407e..2589ea1 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; } -- 2.7.4