hostnamectl: suppress outputting of pretty hostname field in status if empty

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index a1e1bd84437afb0cb79a04cf992f17f60c0e1cf3..064581a31cfdb26b81829fadc3b1e6bf04345fab 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -79,14 +79,18 @@ static void print_status_info(StatusInfo *i) {
         printf("   Static hostname: %s\n",
                strna(i->static_hostname));
 
         printf("   Static hostname: %s\n",
                strna(i->static_hostname));
 

-        if (!streq_ptr(i->hostname, i->static_hostname))
+        if (!isempty(i->pretty_hostname) &&
+            !streq_ptr(i->pretty_hostname, i->static_hostname))
+                printf("   Pretty hostname: %s\n",
+                       strna(i->pretty_hostname));
+
+        if (!isempty(i->hostname) &&
+            !streq_ptr(i->hostname, i->static_hostname))

                 printf("Transient hostname: %s\n",
                        strna(i->hostname));
 
                 printf("Transient hostname: %s\n",
                        strna(i->hostname));
 

-        printf("   Pretty hostname: %s\n"
-               "         Icon name: %s\n"
+        printf("         Icon name: %s\n"

                "           Chassis: %s\n",
                "           Chassis: %s\n",

-               strna(i->pretty_hostname),

                strna(i->icon_name),
                strna(i->chassis));
 
                strna(i->icon_name),
                strna(i->chassis));