]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: ipv4acd: update log message
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 30 Jun 2021 21:38:53 +0000 (06:38 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 1 Jul 2021 07:24:07 +0000 (16:24 +0900)
C.f. https://github.com/systemd/systemd/pull/19980#discussion_r661784168

src/network/networkd-ipv4acd.c

index ea902d9766ed08aef8a29953052eae8d1937d8f8..c2cadc0a3028c79b54e733b0a51ddf3cff843b10 100644 (file)
@@ -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");