diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2019-01-18 01:26:00 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2019-01-18 01:26:00 +0100 |
| commit | 7262681e044dffa25820ea90c657ffac266c254c (patch) | |
| tree | 129c6b76a842f9a9dadbcfe4526a8e05d2731ec0 /libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch | |
| parent | d9473a265ba35ed979d986804d843c2d1a43d520 (diff) | |
| download | abslibre-7262681e044dffa25820ea90c657ffac266c254c.tar.gz abslibre-7262681e044dffa25820ea90c657ffac266c254c.tar.bz2 abslibre-7262681e044dffa25820ea90c657ffac266c254c.zip | |
Move systemd 240.34 from libre-testing to libre
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
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.patch | 22 |
1 files changed, 11 insertions, 11 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 1f49c9ee9..62cd0131c 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 @@ -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); |