test

src/hostname/hostnamed.c

@@ -309,9 +309,15 @@ static int context_update_kernel_hostname(
 
         assert(c);
 
-        r = gethostname_strict(&current);
-        if (r < 0 && r != -ENXIO) /* ignore error if nothing is set yet */
-                return r;
+        if (!transient_hostname) {
+                /* If no transient hostname is passed in, then let's check what is currently set. */
+
+                r = gethostname_strict(&current);
+                if (r < 0 && r != -ENXIO) /* ignore error if nothing is set yet */
+                        return r;
+
+                transient_hostname = current;
+        }
 
         static_hn = c->data[PROP_STATIC_HOSTNAME];
 
@@ -324,10 +330,6 @@ static int context_update_kernel_hostname(
         else if (!isempty(transient_hostname))
                 hn = transient_hostname;
 
-        /* ... what is already set comes next (note that gethostname_strict() above already filters out a few "unset" syntaxes) ... */
-        else if (current)
-                hn = current;
-
         /* ... fallback to static "localhost.*" ignored above ... */
         else if (!isempty(static_hn))
                 hn = static_hn;