From c6e77d7b22e9d3abc16bfc6be3f677198a7071e7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 1 Apr 2019 00:37:58 +0900 Subject: [PATCH] network: add '=' to config key names in log Also, long lines are wrapped. --- src/network/netdev/netdev.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index df05cb465bd..c1bcfc66e66 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -684,12 +684,12 @@ int netdev_load_one(Manager *manager, const char *filename) { } if (netdev_raw->kind == _NETDEV_KIND_INVALID) { - log_warning("NetDev has no Kind configured in %s. Ignoring", filename); + log_warning("NetDev has no Kind= configured in %s. Ignoring", filename); return 0; } if (!netdev_raw->ifname) { - log_warning("NetDev without Name configured in %s. Ignoring", filename); + log_warning("NetDev without Name= configured in %s. Ignoring", filename); return 0; } @@ -704,7 +704,8 @@ int netdev_load_one(Manager *manager, const char *filename) { netdev->n_ref = 1; netdev->manager = manager; netdev->kind = netdev_raw->kind; - netdev->state = NETDEV_STATE_LOADING; /* we initialize the state here for the first time, so that done() will be called on destruction */ + netdev->state = NETDEV_STATE_LOADING; /* we initialize the state here for the first time, + so that done() will be called on destruction */ if (NETDEV_VTABLE(netdev)->init) NETDEV_VTABLE(netdev)->init(netdev); @@ -730,7 +731,9 @@ int netdev_load_one(Manager *manager, const char *filename) { if (!netdev->mac && netdev->kind != NETDEV_KIND_VLAN) { r = netdev_get_mac(netdev->ifname, &netdev->mac); if (r < 0) - return log_error_errno(r, "Failed to generate predictable MAC address for %s: %m", netdev->ifname); + return log_netdev_error_errno(netdev, r, + "Failed to generate predictable MAC address for %s: %m", + netdev->ifname); } r = hashmap_ensure_allocated(&netdev->manager->netdevs, &string_hash_ops); -- 2.47.3