diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-08 14:33:53 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-08 15:03:31 +0200 |
| commit | 3d18b167558bde95a076b16d40f9454f169e70ba (patch) | |
| tree | d83b8eb2445e593f93a8e1e60f53e648f69c969a /src/tty-ask-password-agent | |
| parent | 40e1f4ea7458a0a80eaf1ef356e52bfe0835412e (diff) | |
| download | systemd-3d18b167558bde95a076b16d40f9454f169e70ba.tar.gz | |
util: do not reset terminal in acquire_terminal()
Before, we'd always reset acquired terminals, which is not really
desired, as we expose a setting TTYReset= which is supposed to control
whether the TTY is reset or not. Previously that setting would only
enable a second resetting of the TTY, which is of course pointless...
Hence, move the implicit resetting out of acquire_terminal() and make
the callers do it if they need it.
Diffstat (limited to 'src/tty-ask-password-agent')
| -rw-r--r-- | src/tty-ask-password-agent/tty-ask-password-agent.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 5dbc0a9bcc..93cce186f0 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -315,6 +315,10 @@ static int parse_password(const char *filename, char **wall) { tty_fd = acquire_terminal("/dev/console", false, false, false, USEC_INFINITY); if (tty_fd < 0) return log_error_errno(tty_fd, "Failed to acquire /dev/console: %m"); + + 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); |