From 4a3b54fd3c574a356adf50949f244d289ec74c42 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 18 Nov 2017 01:22:34 +0900 Subject: [PATCH 1/2] networkd: remove debug message and unref when error Follow-up for 8006aa32ee29538ef1d7978d60d6427a0bf31e80. --- src/network/networkd-dhcp6.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index ee28d7ac39..6dfeb68717 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -271,9 +271,8 @@ int dhcp6_configure(Link *link) { goto error; r = dhcp6_set_hostname(client, link); - log_link_warning(link, "dhcp6_set_hostname: %d", r); if (r < 0) - return r; + goto error; r = sd_dhcp6_client_set_ifindex(client, link->ifindex); if (r < 0) From 7b872092d905ee6892039f0289f0abe7c5b45e1c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 18 Nov 2017 01:24:07 +0900 Subject: [PATCH 2/2] networkd: fix indentation --- src/network/networkd-link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 9cd221eb42..374bfde1be 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2773,7 +2773,7 @@ int link_initialized(Link *link, struct udev_device *device) { return r; r = sd_netlink_call_async(link->manager->rtnl, req, - link_initialized_and_synced, link, 0, NULL); + link_initialized_and_synced, link, 0, NULL); if (r < 0) return r;