summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:24:56 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-12-17 00:40:55 -0500
commit3e3e302ae4a0f0a3da5f376febd74e5a54268e93 (patch)
tree3dd5e16dd176b669d0c6228b5a8027a10aa1f6ec
parent9146dc0afb1118a988ce79a249d5e5235b7b52c8 (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 7325adee8f..6611a355d4 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,