summaryrefslogtreecommitdiff
path: root/libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-07-21 17:27:13 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-07-24 00:58:10 -0400
commit5cda8090484becc96da80c15f1db5b8c137a79b9 (patch)
tree633acd19dd3ac32e1f5a58285af2788a070fe0e4 /libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
parentb24f38ea39ad553c4cc428b189687ac6eccf1cfa (diff)
downloadabslibre-5cda8090484becc96da80c15f1db5b8c137a79b9.tar.gz
abslibre-5cda8090484becc96da80c15f1db5b8c137a79b9.tar.bz2
abslibre-5cda8090484becc96da80c15f1db5b8c137a79b9.zip
libre/notsystemd: Update to 239.1
Diffstat (limited to 'libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch')
-rw-r--r--libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch101
1 files changed, 0 insertions, 101 deletions
diff --git a/libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
deleted file mode 100644
index b9e94ee33..000000000
--- a/libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 10ccaa5d0fb340e61abc158238f939f4f7744396 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 to PRETTY_NAME "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 94b6b1110..2f42d49d9 100644
---- a/man/kernel-install.xml
-+++ b/man/kernel-install.xml
-@@ -110,7 +110,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 99bbb6100..27d18749d 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 ac0470b20..36b01500c 100644
---- a/src/analyze/analyze.c
-+++ b/src/analyze/analyze.c
-@@ -658,7 +658,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 bcf9ea5f2..b66093827 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1264,11 +1264,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 bc16290c7..f7574223a 100644
---- a/src/firstboot/firstboot.c
-+++ b/src/firstboot/firstboot.c
-@@ -97,7 +97,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 a0bca05c9..af9f0f9cc 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
---
-2.13.2
-