summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:24:56 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:38:21 -0400
commit20c90fb1a90a1702ce5e7d79dd16ee160640a1ee (patch)
treed82d5ed5e93d8d6f949dfe878549cbb56c013232
parentd6a67e5ff7d99af484a9ebf68d3fe2510bffd099 (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 767a1c764e..f6787f9340 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 60d897758b..3b9adb53e1 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -799,7 +799,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,