diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-01-23 12:28:38 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-01-24 15:32:42 +0100 |
| commit | 02b7005e38db756711cd6463bda34e93cf304c3c (patch) | |
| tree | 10c708589f6d63d5d3542ac879ae58f02114dc96 /src/journal-remote | |
| parent | 31778abf957cdc9d5d99ed02beb072e83c75a18c (diff) | |
| download | systemd-02b7005e38db756711cd6463bda34e93cf304c3c.tar.gz | |
tree-wide: unify how we pick OS pretty name to display
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-gatewayd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 747e0be743..a792c75cca 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -732,7 +732,7 @@ static int request_handler_machine( _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL; RequestMeta *m = ASSERT_PTR(connection_cls); int r; - _cleanup_free_ char* hostname = NULL, *os_name = NULL; + _cleanup_free_ char* hostname = NULL, *pretty_name = NULL, *os_name = NULL; uint64_t cutoff_from = 0, cutoff_to = 0, usage = 0; sd_id128_t mid, bid; _cleanup_free_ char *v = NULL, *json = NULL; @@ -763,7 +763,10 @@ static int request_handler_machine( if (r < 0) return mhd_respondf(connection, r, MHD_HTTP_INTERNAL_SERVER_ERROR, "Failed to determine disk usage: %m"); - (void) parse_os_release(NULL, "PRETTY_NAME", &os_name); + (void) parse_os_release( + NULL, + "PRETTY_NAME", &pretty_name, + "NAME=", &os_name); (void) get_virtualization(&v); r = asprintf(&json, @@ -778,7 +781,7 @@ static int request_handler_machine( SD_ID128_FORMAT_VAL(mid), SD_ID128_FORMAT_VAL(bid), hostname_cleanup(hostname), - os_name ? os_name : "Linux", + os_release_pretty_name(pretty_name, os_name), v ? v : "bare", usage, cutoff_from, |