From 7fd5979b83af086ffcc80e491f6ae4e7fc728638 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 7 Mar 2025 15:11:58 +0100 Subject: [PATCH] hostnamectl: show transient hostname before static hostname The transient one is generally the more relevant one, since it is typically used to reach this host remotely, and it's what shells show you. Hence show it first. --- src/hostname/hostnamectl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index adf3a3296f..bf03f177d3 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -121,6 +121,15 @@ static int print_status_info(StatusInfo *i) { table_set_ersatz_string(table, TABLE_ERSATZ_UNSET); + if (!isempty(i->hostname) && + !streq_ptr(i->hostname, i->static_hostname)) { + r = table_add_many(table, + TABLE_FIELD, "Transient hostname", + TABLE_STRING, i->hostname); + if (r < 0) + return table_log_add_error(r); + } + r = table_add_many(table, TABLE_FIELD, "Static hostname", TABLE_STRING, i->static_hostname); @@ -136,15 +145,6 @@ static int print_status_info(StatusInfo *i) { return table_log_add_error(r); } - if (!isempty(i->hostname) && - !streq_ptr(i->hostname, i->static_hostname)) { - r = table_add_many(table, - TABLE_FIELD, "Transient hostname", - TABLE_STRING, i->hostname); - if (r < 0) - return table_log_add_error(r); - } - if (!isempty(i->icon_name)) { r = table_add_many(table, TABLE_FIELD, "Icon name",