1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Wed, 25 May 2016 12:23:40 -0400
Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
instead of "Linux"
---
man/kernel-install.xml | 2 +-
man/os-release.xml | 2 +-
src/analyze/analyze.c | 2 +-
src/core/main.c | 4 ++--
src/firstboot/firstboot.c | 2 +-
src/kernel-install/90-loaderentry.install | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index 34bb5d2f1e..d22945b5c4 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -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
- missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para>
+ missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para>
<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 5a5e318f75..1afaa679c9 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -153,7 +153,7 @@
<listitem><para>A pretty operating system name in a format 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, a default of <literal>PRETTY_NAME="Linux"</literal> may be used</para>
+ set, a default of <literal>PRETTY_NAME="GNU/Linux"</literal> may be used</para>
<para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem>
</varlistentry>
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 4d81026084..f18bd92289 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -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 (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,
strempty(host->hostname),
strempty(host->kernel_name),
strempty(host->kernel_release),
diff --git a/src/core/main.c b/src/core/main.c
index bcce7178a8..7bebcc9e28 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -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,
- isempty(pretty_name) ? "Linux" : pretty_name);
+ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
else
return status_printf(NULL, 0,
"\nWelcome to %s!\n",
- isempty(pretty_name) ? "Linux" : pretty_name);
+ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
}
static int write_container_id(void) {
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index c9fc8dd5cd..ffaa1c1c13 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -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");
- 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 47a0cd224a..9ff48a9d5c 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -42,7 +42,7 @@ elif [[ -f /usr/lib/os-release ]]; then
fi
if ! [[ $PRETTY_NAME ]]; then
- PRETTY_NAME="Linux $KERNEL_VERSION"
+ PRETTY_NAME="GNU/Linux $KERNEL_VERSION"
fi
if [[ -f /etc/kernel/cmdline ]]; then
--
2.18.0
|
