morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

hostnamectl: show transient hostname before static hostname

Browse Source 
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.
This commit is contained in:
Lennart Poettering
2025-03-07 15:11:58 +01:00
committed by Luca Boccassi
parent dc4cf3e539
commit 7fd5979b83
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/hostname/hostnamectl.c
View File

@@ -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",