summaryrefslogtreecommitdiff
path: root/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch')
-rw-r--r--libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch101
1 files changed, 101 insertions, 0 deletions
diff --git a/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
new file mode 100644
index 000000000..b44003e77
--- /dev/null
+++ b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
@@ -0,0 +1,101 @@
+From 515c6b9cfdc8508225b07f602feaf9680020acbd 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 fa86a3aaa0..cc5ca2a2a9 100644
+--- a/man/kernel-install.xml
++++ b/man/kernel-install.xml
+@@ -112,7 +112,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 b0468c16a0..80d0d39bb9 100644
+--- a/man/os-release.xml
++++ b/man/os-release.xml
+@@ -212,7 +212,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 d45c1dc496..686a951f09 100644
+--- a/src/analyze/analyze.c
++++ b/src/analyze/analyze.c
+@@ -693,7 +693,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 2ad5073368..257ac31ca7 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -1355,11 +1355,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 207ddeb70f..46a20de469 100644
+--- a/src/firstboot/firstboot.c
++++ b/src/firstboot/firstboot.c
+@@ -101,7 +101,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 305ea8f5c9..ae46dcc34d 100644
+--- a/src/kernel-install/90-loaderentry.install
++++ b/src/kernel-install/90-loaderentry.install
+@@ -36,7 +36,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.15.1
+