From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Feb 2018 22:55:19 +0000 (+0100)
Subject: tty-ask-password-agent: show right TTY path in error message
X-Git-Tag: v238~100^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=befd657b00a627b0661cdf94b06c125e7be6a6ee;p=thirdparty%2Fsystemd.git

tty-ask-password-agent: show right TTY path in error message
---

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 871ac27f0e0..ed9adab0676 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -372,11 +372,12 @@ static int parse_password(const char *filename, char **wall) {
 
                                 tty_fd = acquire_terminal(con, ACQUIRE_TERMINAL_WAIT, USEC_INFINITY);
                                 if (tty_fd < 0)
-                                        return log_error_errno(tty_fd, "Failed to acquire /dev/console: %m");
+                                        return log_error_errno(tty_fd, "Failed to acquire %s: %m", con);
 
                                 r = reset_terminal_fd(tty_fd, true);
                                 if (r < 0)
                                         log_warning_errno(r, "Failed to reset terminal, ignoring: %m");
+
                         }
 
                         r = ask_password_tty(message, NULL, not_after, echo ? ASK_PASSWORD_ECHO : 0, filename, &password);