summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:23:40 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-10-21 18:41:01 -0400
commitb0f172057a90da9f95177d2b979bca3760373106 (patch)
treed021b3670b4c8369c02326866136dab2ae685c3b /src
parentb384e7f1ccb41aa9ed1aad142f3f571803efd0cb (diff)
FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" instead of "Linux".
Diffstat (limited to 'src')
-rw-r--r--src/analyze/analyze.c2
-rw-r--r--src/core/main.c4
-rw-r--r--src/firstboot/firstboot.c2
-rw-r--r--src/kernel-install/90-loaderentry.install2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index cbf9354a7a..66830695f3 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -653,7 +653,7 @@ static int analyze_plot(sd_bus *bus) {
svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n");
svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
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 f59a55f166..33e22e37dc 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1240,11 +1240,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,
- isempty(pretty_name) ? "Linux" : pretty_name);
+ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
else
return status_printf(NULL, false, false,
"\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 c9e8e54ee3..83a21eaf0e 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -96,7 +96,7 @@ static void print_welcome(void) {
log_warning_errno(r, "Failed to read os-release file: %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();
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
index a0bca05c9a..af9f0f9ccd 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -38,7 +38,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
declare -a BOOT_OPTIONS