From 631fef79feb0063d1e8000cc17746f1725084a91 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sun, 21 Feb 2021 21:54:20 -0500 Subject: [arm/libre-testing/systemd]: v247.3 --- ...ease-Default-PRETTY_NAME-to-GNU-Linux-ins.patch | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch') diff --git a/libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch index 62cd0131c..2be19da05 100644 --- a/libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch +++ b/libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch @@ -14,23 +14,23 @@ 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 -@@ -88,7 +88,7 @@ - /boot/loader/entries/MACHINE-ID-KERNEL-VERSION.conf. +@@ -94,7 +94,7 @@ + $BOOT/loader/entries/MACHINE-ID-KERNEL-VERSION.conf. The title of the entry is the PRETTY_NAME parameter specified in /etc/os-release or /usr/lib/os-release (if the former is -- missing), or "Linux KERNEL-VERSION", if unset. If the file -+ missing), or "GNU/Linux KERNEL-VERSION", if unset. If the file - initrd is found next to the kernel image file, the initrd will be added to the - configuration. - +- missing), or "Linux KERNEL-VERSION", if unset. ++ missing), or "GNU/Linux KERNEL-VERSION", if unset. + + If the entry directory + $BOOT/MACHINE-ID/KERNEL-VERSION/ 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)". 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("%s", pretty_times); - if (use_full_bus) + if (host) svg("%s %s (%s %s %s) %s %s", - 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 c9fc8dd5cd..ffaa1c1c13 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -87,7 +87,7 @@ static void print_welcome(void) { +@@ -112,7 +112,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; + ac = isempty(ansi_color) ? "0" : ansi_color; + if (colors_enabled()) 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 -- cgit v1.2.3