summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:23:40 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-10-21 18:41:46 -0400
commitb7c015e703e26214e4522c99474a08ff803b43de (patch)
tree569403264cdd813645ac6654358c1f2c098523d3
parent2eb38a70869778f3ae1423b3d9d96ee709ddd6d5 (diff)
FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" instead of "Linux".
-rw-r--r--man/kernel-install.xml2
-rw-r--r--man/os-release.xml2
-rw-r--r--src/analyze/analyze.c2
-rw-r--r--src/core/main.c4
-rw-r--r--src/firstboot/firstboot.c2
-rw-r--r--src/kernel-install/90-loaderentry.install2
6 files changed, 7 insertions, 7 deletions
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index d7e27de758..eb519188a6 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -106,7 +106,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 99bbb61004..27d18749dc 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -210,7 +210,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 cbf9354a7a..66830695f3 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -653,7 +653,7 @@ static int analyze_plot(sd_bus *bus) {
svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n");
svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
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 f59a55f166..33e22e37dc 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1240,11 +1240,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 c9e8e54ee3..83a21eaf0e 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -96,7 +96,7 @@ static void print_welcome(void) {
log_warning_errno(r, "Failed to read os-release file: %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 a0bca05c9a..af9f0f9ccd 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -38,7 +38,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