diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-04-16 09:54:52 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-04-16 19:48:54 +0900 |
| commit | 74bd6ad016ded9be76838b8963c1ed8719cc53b6 (patch) | |
| tree | 3334fbf5c105dbc633908243a6aa06433e64417f /src/network/netdev/netdev.c | |
| parent | 6064344894fc9d6fccc05fac843488c8220e468b (diff) | |
| download | systemd-74bd6ad016ded9be76838b8963c1ed8719cc53b6.tar.gz | |
network: update log message
In some optimization level with gcc, including netdev->ifname in log
message causes error.
Diffstat (limited to 'src/network/netdev/netdev.c')
| -rw-r--r-- | src/network/netdev/netdev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index b31f0fa81a..81d9260c12 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -747,8 +747,7 @@ int netdev_load_one(Manager *manager, const char *filename) { r = netdev_get_mac(netdev->ifname, &netdev->mac); if (r < 0) return log_netdev_error_errno(netdev, r, - "Failed to generate predictable MAC address for %s: %m", - netdev->ifname); + "Failed to generate predictable MAC address: %m"); } r = hashmap_ensure_put(&netdev->manager->netdevs, &string_hash_ops, netdev->ifname, netdev); @@ -760,8 +759,8 @@ int netdev_load_one(Manager *manager, const char *filename) { assert(n); if (!streq(netdev->filename, n->filename)) log_netdev_warning_errno(netdev, r, - "The setting Name=%s in %s conflicts with the one in %s, ignoring", - netdev->ifname, netdev->filename, n->filename); + "Device was already configured by file %s, ignoring %s.", + n->filename, netdev->filename); /* Clear ifname before netdev_free() is called. Otherwise, the NetDev object 'n' is * removed from the hashmap 'manager->netdevs'. */ |