summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2016-05-25 12:24:56 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2018-08-16 21:52:06 -0400
commit7a5c308abb0abc1e1f78b25e42c517cfeb9c1c98 (patch)
tree0eccda33da511de4b9ce674cfc9ca05b777cacaf
parent801f9afcc424865f52b676b9c2693de4d37f2d71 (diff)
FSDG: os-release: Default NAME to "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 9ff4b7e8c2..1c069275c8 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -98,7 +98,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 9e77e314ff..3d0c3aafd7 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -788,7 +788,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,