summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:24:56 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-09 02:22:28 -0400
commit10c64ce22b1abea61cb29d9d2ffcbbd2e84448b1 (patch)
treeca72eb81c6086b948026423ccb6449dfaa3441bd
parent227b234720823fc02c3f70cd80da281beb869464 (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 4ad9184993..e265027a04 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -801,7 +801,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,