summaryrefslogtreecommitdiff
path: root/src/hostname
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-05-04 18:00:12 +0900
committerLennart Poettering <lennart@poettering.net>2021-05-04 15:27:20 +0200
commit8fc1efa88fb935ab4357fa39ed71ccb70df55d7e (patch)
tree2e7966bcb49993fb1c037236eea8161ea3ddea8a /src/hostname
parent296c13dec4019c86dbb9197617e447e40781e79d (diff)
downloadsystemd-8fc1efa88fb935ab4357fa39ed71ccb70df55d7e.tar.gz
hostnamectl: fix hyperlink in "Operating System" field
This fixes a bug introduced by 822be62fb23ed0ec1062ffd18057e53f6c2f8c01. Before this, if terminal width is not enough, the all subsequent lines are included in the hyperlink. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1955475.
Diffstat (limited to 'src/hostname')
-rw-r--r--src/hostname/hostnamectl.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index 852da6bb8e..283038c7cb 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -158,17 +158,10 @@ static int print_status_info(StatusInfo *i) {
}
if (!isempty(i->os_pretty_name)) {
- _cleanup_free_ char *formatted = NULL;
- const char *t = i->os_pretty_name;
-
- if (i->home_url) {
- if (terminal_urlify(i->home_url, i->os_pretty_name, &formatted) >= 0)
- t = formatted;
- }
-
r = table_add_many(table,
TABLE_STRING, "Operating System:",
- TABLE_STRING, t);
+ TABLE_STRING, i->os_pretty_name,
+ TABLE_SET_URL, i->home_url);
if (r < 0)
return table_log_add_error(r);
}