summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2016-05-25 12:24:56 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2017-09-10 20:19:01 -0400
commit1fc4ab4437eda41485eeba793eef451753b878bb (patch)
tree53e44ce2d46bb84cdd9dce20e63a17c0177d5fbf
parent3a213a23d7c4de81cae4f80ade7ef3088615e3e0 (diff)
FSDG: os-release: Default to NAME "GNU/Linux" instead of "Linux"
-rw-r--r--man/os-release.xml2
-rw-r--r--src/journal-remote/journal-gatewayd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/os-release.xml b/man/os-release.xml
index 27d18749dc..a88d16b171 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -121,7 +121,7 @@
<listitem><para>A string identifying the operating system,
without a version component, and suitable for presentation to
the user. If not set, defaults to
- <literal>NAME=Linux</literal>. Example:
+ <literal>NAME=GNU/Linux</literal>. Example:
<literal>NAME=Fedora</literal> or <literal>NAME="Debian
GNU/Linux"</literal>.</para></listitem>
</varlistentry>
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 9a1c5b76ca..93e5f1ae7d 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -805,7 +805,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_name ? os_name : "GNU/Linux",
v ? v : "bare",
usage,
cutoff_from,