diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-08-19 09:59:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 09:59:16 +0200 |
| commit | 165df4dcda5eae4f5a5de2ce378df082c36f4a7a (patch) | |
| tree | 9a5d72e8570ce717e3bb15ad426573c8c22657e1 /src | |
| parent | Revert "shared/conf-parser,networkd: EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE â†... (diff) | |
| parent | test-network: update test for PreferredLifetime=0 (diff) | |
| download | systemd-165df4dcda5eae4f5a5de2ce378df082c36f4a7a.tar.xz systemd-165df4dcda5eae4f5a5de2ce378df082c36f4a7a.zip | |
Merge pull request #13345 from yuwata/network-fix-preferred-lifetime-zero-13341
network: fix PreferredLifetime=0
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/networkd-address.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index e6f30a2842..885cda3a03 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -978,10 +978,7 @@ int config_parse_address_scope(const char *unit, bool address_is_ready(const Address *a) { assert(a); - if (a->family == AF_INET6) - return !(a->flags & IFA_F_TENTATIVE); - else - return !(a->flags & (IFA_F_TENTATIVE | IFA_F_DEPRECATED)); + return !(a->flags & IFA_F_TENTATIVE); } int address_section_verify(Address *address) { |