From 75f76e6b857ae55a55c4a03f96029a9ce3109321 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 19 Jul 2018 12:38:34 -0400 Subject: libre/systemd: Re-generate the FSDG patch files --- ...ease-Default-PRETTY_NAME-to-GNU-Linux-ins.patch | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch') 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 44b58ac5c..1f49c9ee9 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 @@ -1,4 +1,4 @@ -From 515c6b9cfdc8508225b07f602feaf9680020acbd Mon Sep 17 00:00:00 2001 +From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 25 May 2016 12:23:40 -0400 Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux" @@ -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 fa86a3aaa0..cc5ca2a2a9 100644 +index cd9756662a..9ead6ea39b 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml -@@ -112,7 +112,7 @@ +@@ -88,7 +88,7 @@ PRETTY_NAME parameter specified in /etc/os-release or /usr/lib/os-release (if the former is @@ -27,10 +27,10 @@ index fa86a3aaa0..cc5ca2a2a9 100644 the file initrd is found next to the linux file, the initrd will be added to diff --git a/man/os-release.xml b/man/os-release.xml -index b0468c16a0..80d0d39bb9 100644 +index a51edf3b8a..9ff4b7e8c2 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -212,7 +212,7 @@ +@@ -187,7 +187,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,10 +40,10 @@ index b0468c16a0..80d0d39bb9 100644 Miracle)". diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c -index d45c1dc496..686a951f09 100644 +index de0fe6eba8..9f239c8eeb 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c -@@ -693,7 +693,7 @@ static int analyze_plot(sd_bus *bus) { +@@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) { svg("%s", pretty_times); if (use_full_bus) svg("%s %s (%s %s %s) %s %s", @@ -53,10 +53,10 @@ index d45c1dc496..686a951f09 100644 strempty(host->kernel_name), strempty(host->kernel_release), diff --git a/src/core/main.c b/src/core/main.c -index 2ad5073368..257ac31ca7 100644 +index 44dd8348be..9a4fc26425 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1355,11 +1355,11 @@ static int status_welcome(void) { +@@ -1234,11 +1234,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, @@ -71,11 +71,11 @@ index 2ad5073368..257ac31ca7 100644 static int write_container_id(void) { diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 207ddeb70f..46a20de469 100644 +index a98e53b3a3..41b212e32d 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"); +@@ -87,7 +87,7 @@ static void print_welcome(void) { + "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); @@ -84,10 +84,10 @@ index 207ddeb70f..46a20de469 100644 press_any_key(); diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install -index 305ea8f5c9..ae46dcc34d 100644 +index a271cdb8a0..29047ccbff 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 +@@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then fi if ! [[ $PRETTY_NAME ]]; then @@ -97,5 +97,5 @@ index 305ea8f5c9..ae46dcc34d 100644 declare -a BOOT_OPTIONS -- -2.15.1 +2.18.0 -- cgit v1.2.3