diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2019-01-15 23:38:46 -0500 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-01-16 03:04:10 -0500 |
| commit | f818cc2b16d97de5b0c7c2c5fcba834a3971ce65 (patch) | |
| tree | ef77b0793aca55b88ecd28033806b04f181ff6c6 /libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch | |
| parent | b1287b34794130a1ff32f61a1ba30b9a830466c1 (diff) | |
| download | abslibre-f818cc2b16d97de5b0c7c2c5fcba834a3971ce65.tar.gz abslibre-f818cc2b16d97de5b0c7c2c5fcba834a3971ce65.tar.bz2 abslibre-f818cc2b16d97de5b0c7c2c5fcba834a3971ce65.zip | |
[systemd]: upgrade to v240
Diffstat (limited to 'libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch')
| -rw-r--r-- | libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch | 22 |
1 files changed, 11 insertions, 11 deletions
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 1f49c9ee9..62cd0131c 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 @@ -18,14 +18,14 @@ index cd9756662a..9ead6ea39b 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -88,7 +88,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 + <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 +- missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset. If the file ++ missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset. If the file + <filename>initrd</filename> is found next to the kernel image file, the initrd will be added to the + configuration.</para></listitem> + </itemizedlist> diff --git a/man/os-release.xml b/man/os-release.xml index a51edf3b8a..9ff4b7e8c2 100644 --- a/man/os-release.xml @@ -56,14 +56,14 @@ diff --git a/src/core/main.c b/src/core/main.c index 44dd8348be..9a4fc26425 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1234,11 +1234,11 @@ static int status_welcome(void) { - return status_printf(NULL, false, false, +@@ -1375,11 +1375,11 @@ + return status_printf(NULL, 0, "\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, + return status_printf(NULL, 0, "\nWelcome to %s!\n", - isempty(pretty_name) ? "Linux" : pretty_name); + isempty(pretty_name) ? "GNU/Linux" : pretty_name); |