From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Wed, 25 May 2016 12:23:40 -0400
Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
 instead of "Linux"

---
 man/kernel-install.xml                    | 2 +-
 man/os-release.xml                        | 2 +-
 src/analyze/analyze.c                     | 2 +-
 src/core/main.c                           | 4 ++--
 src/firstboot/firstboot.c                 | 2 +-
 src/kernel-install/90-loaderentry.install | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index cd9756662a..9ead6ea39b 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -88,7 +88,7 @@
           <replaceable>PRETTY_NAME</replaceable> parameter specified
           in <filename>/etc/os-release</filename> or
           <filename>/usr/lib/os-release</filename> (if the former is
-          missing), or "Linux
+          missing), or "GNU/Linux
           <replaceable>KERNEL-VERSION</replaceable>", if unset.  If
           the file <filename>initrd</filename> is found next to the
           <filename>linux</filename> file, the initrd will be added to
diff --git a/man/os-release.xml b/man/os-release.xml
index a51edf3b8a..9ff4b7e8c2 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -187,7 +187,7 @@
         suitable for presentation to the user. May or may not contain
         a release code name or OS version of some kind, as suitable.
         If not set, defaults to
-        <literal>PRETTY_NAME="Linux"</literal>. Example:
+        <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
         <literal>PRETTY_NAME="Fedora 17 (Beefy
         Miracle)"</literal>.</para></listitem>
       </varlistentry>
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index de0fe6eba8..9f239c8eeb 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) {
         svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
         if (use_full_bus)
                 svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
-                    isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,
+                    isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name,
                     strempty(host->hostname),
                     strempty(host->kernel_name),
                     strempty(host->kernel_release),
diff --git a/src/core/main.c b/src/core/main.c
index 44dd8348be..9a4fc26425 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1234,11 +1234,11 @@ static int status_welcome(void) {
                 return status_printf(NULL, false, false,
                                      "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
                                      isempty(ansi_color) ? "1" : ansi_color,
-                                     isempty(pretty_name) ? "Linux" : pretty_name);
+                                     isempty(pretty_name) ? "GNU/Linux" : pretty_name);
         else
                 return status_printf(NULL, false, false,
                                      "\nWelcome to %s!\n",
-                                     isempty(pretty_name) ? "Linux" : pretty_name);
+                                     isempty(pretty_name) ? "GNU/Linux" : pretty_name);
 }
 
 static int write_container_id(void) {
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index a98e53b3a3..41b212e32d 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -87,7 +87,7 @@ static void print_welcome(void) {
                                "Failed to read os-release file, ignoring: %m");
 
         printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
-               isempty(pretty_name) ? "Linux" : pretty_name);
+               isempty(pretty_name) ? "GNU/Linux" : pretty_name);
 
         press_any_key();
 
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
index a271cdb8a0..29047ccbff 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then
 fi
 
 if ! [[ $PRETTY_NAME ]]; then
-    PRETTY_NAME="Linux $KERNEL_VERSION"
+    PRETTY_NAME="GNU/Linux $KERNEL_VERSION"
 fi
 
 declare -a BOOT_OPTIONS
-- 
2.18.0