projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
df560cf
)
networkd: tunnel ignore wrong conf rather than assert
author
Susant Sahani
<susant@redhat.com>
Fri, 8 Jun 2018 12:32:21 +0000
(18:02 +0530)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Fri, 8 Jun 2018 14:09:19 +0000
(16:09 +0200)
Closes #9234
src/network/netdev/tunnel.c
patch
|
blob
|
history
diff --git
a/src/network/netdev/tunnel.c
b/src/network/netdev/tunnel.c
index
496407e
..
2589ea1
100644
(file)
--- 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;
}