From: Yu Watanabe Date: Wed, 30 Jun 2021 21:38:53 +0000 (+0900) Subject: network: ipv4acd: update log message X-Git-Tag: v249-rc3~6^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd3a828c629b42a01bfca04a432cd828458275e1;p=thirdparty%2Fsystemd.git network: ipv4acd: update log message C.f. https://github.com/systemd/systemd/pull/19980#discussion_r661784168 --- diff --git a/src/network/networkd-ipv4acd.c b/src/network/networkd-ipv4acd.c index ea902d9766e..c2cadc0a302 100644 --- a/src/network/networkd-ipv4acd.c +++ b/src/network/networkd-ipv4acd.c @@ -36,12 +36,12 @@ static int static_address_on_conflict(Link *link, Address *address) { assert(address); if (address_get(link, address, NULL) < 0) { - log_link_warning(link, "Cannot configure requested address "IPV4_ADDRESS_FMT_STR", as an address conflict is detected.", + log_link_warning(link, "Cannot configure requested address "IPV4_ADDRESS_FMT_STR", as an address conflict was detected.", IPV4_ADDRESS_FMT_VAL(address->in_addr.in)); return 0; } - log_link_warning(link, "Dropping address "IPV4_ADDRESS_FMT_STR", as an address conflict is detected.", + log_link_warning(link, "Dropping address "IPV4_ADDRESS_FMT_STR", as an address conflict was detected.", IPV4_ADDRESS_FMT_VAL(address->in_addr.in)); r = address_remove(address, link); @@ -66,7 +66,7 @@ static int dhcp4_address_on_conflict(Link *link) { /* Unlikely, but during probing the address, the lease may be lost. */ return 0; - log_link_warning(link, "Dropping DHCPv4 lease, as an address conflict is detected."); + log_link_warning(link, "Dropping DHCPv4 lease, as an address conflict was detected."); r = dhcp4_lease_lost(link); if (r < 0) return log_link_warning_errno(link, r, "Failed to drop DHCPv4 lease: %m");