From b146c76b4023d2f9700dd60760e69df1b02852a7 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 25 May 2016 12:24:56 -0400
Subject: FSDG: os-release: Default to NAME "GNU/Linux" instead of "Linux".

---
 man/os-release.xml                    | 2 +-
 src/journal-remote/journal-gatewayd.c | 2 +-
 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,
-- 
cgit v1.2.3-54-g00ecf