diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-05-04 11:25:05 +0200 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-05-04 16:46:02 +0200 |
commit | 810ae0dc954c65a602ab8d3b9ff7047b85619717 (patch) | |
tree | 72df8885af540c9dcbc1c9d949af76093ad0c3dc | |
parent | 29e81083bd2fcb2dbf83f67ef358c7d25adf7e9d (diff) | |
download | systemd-810ae0dc954c65a602ab8d3b9ff7047b85619717.tar.gz |
network: warn about Network.IPv4LL= is deprecated
-rw-r--r-- | src/network/networkd-network.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 66cce13e31..a85d5ede28 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -825,6 +825,7 @@ int config_parse_ipv4ll( void *userdata) { AddressFamilyBoolean *link_local = data; + int r; assert(filename); assert(lvalue); @@ -835,7 +836,20 @@ int config_parse_ipv4ll( * config_parse_address_family_boolean(), except that it * applies only to IPv4 */ - SET_FLAG(*link_local, ADDRESS_FAMILY_IPV4, parse_boolean(rvalue)); + r = parse_boolean(rvalue); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, r, + "Failed to parse %s=%s, ignoring assignment. " + "Note that the setting %s= is deprecated, please use LinkLocalAddressing= instead.", + lvalue, rvalue, lvalue); + return 0; + } + + SET_FLAG(*link_local, ADDRESS_FAMILY_IPV4, r); + + log_syntax(unit, LOG_WARNING, filename, line, 0, + "%s=%s is deprecated, please use LinkLocalAddressing=%s instead.", + lvalue, rvalue, address_family_boolean_to_string(*link_local)); return 0; } |