From: Yu Watanabe Date: Wed, 27 Feb 2019 08:43:08 +0000 (+0900) Subject: network: rename GatewayOnlink= to GatewayOnLink= X-Git-Tag: v242-rc1~229^2~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cb8c5593443d24c19e40bfd4fc06d672f8c554c;p=thirdparty%2Fsystemd.git network: rename GatewayOnlink= to GatewayOnLink= But still GatewayOnlink= is supported for backward compatibility. --- diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 2058ba74a35..8b6c187f346 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -1081,7 +1081,7 @@ - GatewayOnlink= + GatewayOnLink= Takes a boolean. If set to true, the kernel does not have to check if the gateway is reachable directly by the current machine (i.e., the kernel does diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 1437d83f73a..7888bdf07af 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -117,6 +117,7 @@ Route.Scope, config_parse_route_scope, Route.PreferredSource, config_parse_preferred_src, 0, 0 Route.Table, config_parse_route_table, 0, 0 Route.MTUBytes, config_parse_route_mtu, AF_UNSPEC, 0 +Route.GatewayOnLink, config_parse_gateway_onlink, 0, 0 Route.GatewayOnlink, config_parse_gateway_onlink, 0, 0 Route.IPv6Preference, config_parse_ipv6_route_preference, 0, 0 Route.Protocol, config_parse_route_protocol, 0, 0 diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 6f67f18e645..537f0e48eb6 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -946,7 +946,7 @@ int config_parse_gateway_onlink( r = parse_boolean(rvalue); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, r, - "Could not parse gateway onlink \"%s\", ignoring assignment: %m", rvalue); + "Could not parse %s=\"%s\", ignoring assignment: %m", lvalue, rvalue); return 0; } diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network index 587327735fe..d77c6989cdd 100644 --- a/test/fuzz/fuzz-network-parser/directives.network +++ b/test/fuzz/fuzz-network-parser/directives.network @@ -60,6 +60,7 @@ Protocol= Table= Gateway= InitialAdvertisedReceiveWindow= +GatewayOnLink= GatewayOnlink= Type= InitialCongestionWindow= diff --git a/test/fuzz/fuzz-unit-file/directives.service b/test/fuzz/fuzz-unit-file/directives.service index 4d7526f6361..2fdfd51d60d 100644 --- a/test/fuzz/fuzz-unit-file/directives.service +++ b/test/fuzz/fuzz-unit-file/directives.service @@ -409,7 +409,7 @@ From= FwMark= GVRP= Gateway= -GatewayOnlink= +GatewayOnLink= GenericReceiveOffload= GenericSegmentationOffload= GratuitousARP= diff --git a/test/test-network/conf/25-route-gateway-on-link.network b/test/test-network/conf/25-route-gateway-on-link.network index aa64c255167..14894c54bfb 100644 --- a/test/test-network/conf/25-route-gateway-on-link.network +++ b/test/test-network/conf/25-route-gateway-on-link.network @@ -10,4 +10,4 @@ Scope=link [Route] Gateway=149.10.125.65 -GatewayOnlink=true +GatewayOnLink=true