From: Tom Gundersen <teg@jklm.no>
Date: Wed, 19 Feb 2014 14:59:31 +0000 (+0100)
Subject: networkd: link - only reset transient hostname if it was set by us
X-Git-Tag: v209~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=216816c6bcabd70342593637a55300749a567f5c;p=elogind.git

networkd: link - only reset transient hostname if it was set by us
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 66bcb6bac..aa23bfbc9 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -507,9 +507,14 @@ static int dhcp_lease_lost(Link *link) {
         }
 
         if (link->network->dhcp_hostname) {
-                r = set_hostname(link->manager->bus, "");
-                if (r < 0)
-                        log_error("Failed to reset transient hostname");
+                const char *hostname = NULL;
+
+                r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname);
+                if (r >= 0 && hostname) {
+                        r = set_hostname(link->manager->bus, "");
+                        if (r < 0)
+                                log_error("Failed to reset transient hostname");
+                }
         }
 
         link->dhcp_lease = sd_dhcp_lease_unref(link->dhcp_lease);