From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 12 Dec 2020 12:34:48 +0000 (+0100)
Subject: hostnamed: improve message about static hostname
X-Git-Tag: v248-rc1~491^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=468695c8cdab09ab8235b43133960c4e1b2e9e46;p=thirdparty%2Fsystemd.git

hostnamed: improve message about static hostname

Changed static hostname to 'n/a' is not very nice.
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index c41d5fd741f..43b5c116124 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -689,7 +689,10 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
                 return sd_bus_error_set_errnof(error, r, "Failed to set static hostname: %m");
         }
 
-        log_info("Changed static hostname to '%s'", strna(c->data[PROP_STATIC_HOSTNAME]));
+        if (c->data[PROP_STATIC_HOSTNAME])
+                log_info("Changed static hostname to <%s>", c->data[PROP_STATIC_HOSTNAME]);
+        else
+                log_info("Unset static hostname.");
 
         (void) sd_bus_emit_properties_changed(sd_bus_message_get_bus(m),
                                               "/org/freedesktop/hostname1", "org.freedesktop.hostname1", "StaticHostname", NULL);