summaryrefslogtreecommitdiff
path: root/src/network/networkd-dhcp-common.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-11-24 15:58:04 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2020-12-02 20:31:39 +0900
commitf63e09ef752ab0a4ad75c41246dc3a9a07eef2d8 (patch)
tree223b81d2a24ac70a44839cddcea7f9c43ccf4cdc /src/network/networkd-dhcp-common.c
parent0f82a2ab5c8d812791aca9686bdcc45f39c62431 (diff)
downloadsystemd-f63e09ef752ab0a4ad75c41246dc3a9a07eef2d8.tar.gz
network: use bus_error_message()
Diffstat (limited to 'src/network/networkd-dhcp-common.c')
-rw-r--r--src/network/networkd-dhcp-common.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
index 904cb34d13..4dd98a2c61 100644
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -3,6 +3,7 @@
#include <netinet/in.h>
#include <linux/if_arp.h>
+#include "bus-error.h"
#include "dhcp-internal.h"
#include "dhcp6-internal.h"
#include "escape.h"
@@ -99,18 +100,20 @@ static int get_product_uuid_handler(sd_bus_message *m, void *userdata, sd_bus_er
e = sd_bus_message_get_error(m);
if (e) {
- log_error_errno(sd_bus_error_get_errno(e),
- "Could not get product UUID. Falling back to use machine-app-specific ID as DUID-UUID: %s",
- e->message);
+ r = sd_bus_error_get_errno(e);
+ log_warning_errno(r, "Could not get product UUID. Falling back to use machine-app-specific ID as DUID-UUID: %s",
+ bus_error_message(e, r));
goto configure;
}
r = sd_bus_message_read_array(m, 'y', &a, &sz);
- if (r < 0)
+ if (r < 0) {
+ log_warning_errno(r, "Failed to get product UUID. Falling back to use machine-app-specific ID as DUID-UUID: %m");
goto configure;
+ }
if (sz != sizeof(sd_id128_t)) {
- log_error("Invalid product UUID. Falling back to use machine-app-specific ID as DUID-UUID.");
+ log_warning("Invalid product UUID. Falling back to use machine-app-specific ID as DUID-UUID.");
goto configure;
}