From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 19 May 2023 20:30:33 +0000 (+0900)
Subject: cryptenroll: update log messages
X-Git-Tag: v254-rc1~431^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F27714%2Fhead;p=thirdparty%2Fsystemd.git

cryptenroll: update log messages
---

diff --git a/src/cryptenroll/cryptenroll-password.c b/src/cryptenroll/cryptenroll-password.c
index 450f9859716..d636db266eb 100644
--- a/src/cryptenroll/cryptenroll-password.c
+++ b/src/cryptenroll/cryptenroll-password.c
@@ -34,7 +34,7 @@ int load_volume_key_password(
                                 envpw,
                                 strlen(envpw));
                 if (r < 0)
-                        return log_error_errno(r, "Password from environment variable $PASSWORD did not work.");
+                        return log_error_errno(r, "Password from environment variable $PASSWORD did not work: %m");
         } else {
                 AskPasswordFlags ask_password_flags = ASK_PASSWORD_PUSH_CACHE|ASK_PASSWORD_ACCEPT_CACHED;
                 _cleanup_free_ char *question = NULL, *disk_path = NULL;
@@ -56,7 +56,7 @@ int load_volume_key_password(
 
                         if (--i == 0)
                                 return log_error_errno(SYNTHETIC_ERRNO(ENOKEY),
-                                                       "Too many attempts, giving up:");
+                                                       "Too many attempts, giving up.");
 
                         r = ask_password_auto(
                                         question, "drive-harddisk", id, "cryptenroll", "cryptenroll.passphrase", USEC_INFINITY,
@@ -78,7 +78,7 @@ int load_volume_key_password(
                                         break;
                         }
 
-                        log_error_errno(r, "Password not correct, please try again.");
+                        log_error_errno(r, "Password not correct, please try again: %m");
                         ask_password_flags &= ~ASK_PASSWORD_ACCEPT_CACHED;
                 }
         }
@@ -122,7 +122,7 @@ int enroll_password(
 
                         if (--i == 0)
                                 return log_error_errno(SYNTHETIC_ERRNO(ENOKEY),
-                                                       "Too many attempts, giving up:");
+                                                       "Too many attempts, giving up.");
 
                         question = strjoin("Please enter new passphrase for disk ", node, ":");
                         if (!question)