From: Michael Biebl <biebl@debian.org>
Date: Tue, 21 Dec 2010 02:07:36 +0000 (+0100)
Subject: debian: Prefix welcome string with "Debian "
X-Git-Tag: v16~43
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=22927a3654915670c6d2c7f2e60ea5f54cd2503d;ds=inline

debian: Prefix welcome string with "Debian "

For stable releases /etc/debian_version only contains a version number,
so we add a prefix "Debian ".
---

diff --git a/src/util.c b/src/util.c
index 0cd78f656..d12b5e772 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3047,12 +3047,16 @@ void status_welcome(void) {
 #elif defined(TARGET_DEBIAN)
 
         if (!pretty_name) {
-                if ((r = read_one_line_file("/etc/debian_version", &pretty_name)) < 0) {
+                char *version;
+                if ((r = read_one_line_file("/etc/debian_version", &version)) < 0) {
 
                         if (r != -ENOENT)
                                 log_warning("Failed to read /etc/debian_version: %s", strerror(-r));
-                } else
-                        truncate_nl(pretty_name);
+                } else {
+                        truncate_nl(version);
+                        pretty_name = strappend("Debian ", version);
+                        free(version);
+                }
         }
 
         if (!ansi_color)