summaryrefslogtreecommitdiff
path: root/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2019-09-11 11:34:03 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2019-09-11 11:34:03 -0500
commit2601041457aa287ca790e02815b45324cf82cdbd (patch)
tree8a2ef33639044e8ac2b9e06decf9be8b07e4fc83 /libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
parentb4852d2cbda1fce606edfb56c1765df52656e458 (diff)
downloadabslibre-2601041457aa287ca790e02815b45324cf82cdbd.tar.gz
abslibre-2601041457aa287ca790e02815b45324cf82cdbd.tar.bz2
abslibre-2601041457aa287ca790e02815b45324cf82cdbd.zip
systemd-243.0-1.par1: updating version
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.patch38
1 files changed, 19 insertions, 19 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
index 6095334b2..9e8a078f1 100644
--- 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
@@ -14,10 +14,10 @@ Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
-index cd9756662a..9ead6ea39b 100644
+index 34bb5d2f1e..d22945b5c4 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
-@@ -97,7 +97,7 @@
+@@ -94,7 +94,7 @@
<filename>$BOOT/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.
The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in
<filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former is
@@ -27,10 +27,10 @@ index cd9756662a..9ead6ea39b 100644
<para>If the entry directory
<filename>$BOOT/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename>
diff --git a/man/os-release.xml b/man/os-release.xml
-index a51edf3b8a..9ff4b7e8c2 100644
+index 5a5e318f75..1afaa679c9 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
-@@ -187,7 +187,7 @@
+@@ -184,7 +184,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
@@ -40,12 +40,12 @@ index a51edf3b8a..9ff4b7e8c2 100644
Miracle)"</literal>.</para></listitem>
</varlistentry>
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index de0fe6eba8..9f239c8eeb 100644
+index 4d81026084..f18bd92289 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) {
+@@ -747,7 +747,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)
+ if (host)
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,
@@ -53,10 +53,10 @@ index de0fe6eba8..9f239c8eeb 100644
strempty(host->kernel_name),
strempty(host->kernel_release),
diff --git a/src/core/main.c b/src/core/main.c
-index 44dd8348be..9a4fc26425 100644
+index bcce7178a8..7bebcc9e28 100644
--- a/src/core/main.c
+++ b/src/core/main.c
-@@ -1375,11 +1375,11 @@
+@@ -1242,11 +1242,11 @@ static int status_welcome(void) {
return status_printf(NULL, 0,
"\nWelcome to \x1B[%sm%s\x1B[0m!\n",
isempty(ansi_color) ? "1" : ansi_color,
@@ -71,23 +71,23 @@ index 44dd8348be..9a4fc26425 100644
static int write_container_id(void) {
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index a98e53b3a3..41b212e32d 100644
+index 528e6452cf..3c9765f1e5 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
-@@ -87,7 +87,7 @@ static void print_welcome(void) {
+@@ -104,7 +104,7 @@ static void print_welcome(void) {
+ log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r,
"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();
+- pn = isempty(pretty_name) ? "Linux" : pretty_name;
++ pn = isempty(pretty_name) ? "GNU/Linux" : pretty_name;
+ if (colors_enabled())
+ printf("\nWelcome to your new installation of \x1B[%sm%s\x1B[0m!\n", ansi_color, pn);
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
-index a271cdb8a0..29047ccbff 100644
+index 47a0cd224a..9ff48a9d5c 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
+@@ -42,7 +42,7 @@ elif [[ -f /usr/lib/os-release ]]; then
fi
if ! [[ $PRETTY_NAME ]]; then
@@ -95,7 +95,7 @@ index a271cdb8a0..29047ccbff 100644
+ PRETTY_NAME="GNU/Linux $KERNEL_VERSION"
fi
- declare -a BOOT_OPTIONS
+ if [[ -f /etc/kernel/cmdline ]]; then
--
2.18.0