From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 9 Aug 2019 14:35:36 +0000 (+0200)
Subject: firstboot: drop duplicate trailing whitespace from root pw question
X-Git-Tag: v243-rc2~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3619634ca5451c38d59e220f72b46f3832813c40;p=thirdparty%2Fsystemd.git

firstboot: drop duplicate trailing whitespace from root pw question

Since ask_password() (and related calls) already append one char, we
ended up appending two. That's not pretty. Let's fix this, and do it
like in all other cases ask_password() (or an equivalent function) is
called.
---

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 1de5d122231..528e6452cf4 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -553,8 +553,8 @@ static int prompt_root_password(void) {
         print_welcome();
         putchar('\n');
 
-        msg1 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter a new root password (empty to skip): ");
-        msg2 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter new root password again: ");
+        msg1 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter a new root password (empty to skip):");
+        msg2 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter new root password again:");
 
         for (;;) {
                 _cleanup_strv_free_erase_ char **a = NULL, **b = NULL;