debian: Prefix welcome string with "Debian "

[elogind.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 861f9eaa437ba8c5fbe7f768979473cabfc8ee82..d12b5e772da601b9379e0c0efde09481564d7a56 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -495,6 +495,9 @@ int write_one_line_file(const char *fn, const char *line) {
                 goto finish;
         }
 
+        if (!endswith(line, "\n"))
+                fputc('\n', f);
+
         r = 0;
 finish:
         fclose(f);
@@ -3044,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)