forwarded 846107 util-li...@vger.kernel.org tags 846107 +patch stop Looks like this was an upstream issue. The attached patch has been submitted upstream.
Bjørn
From 616ae007183733dd0a0f5134bb0b666aae95878b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bj...@mork.no>
Date: Mon, 28 Nov 2016 16:27:19 +0100
Subject: [PATCH 1/2] sulogin: make --timeout actually time out
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Bjørn Mork <bj...@mork.no>
---
login-utils/sulogin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 1c4313af4647..6a3890e80a16 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -644,7 +644,7 @@ static char *getpasswd(struct console *con)
eightbit = ((con->flags & CON_SERIAL) == 0 || (tty.c_cflag & (PARODD|PARENB)) == 0);
while (cp->eol == '\0') {
if (read(fd, &c, 1) < 1) {
- if (errno == EINTR || errno == EAGAIN) {
+ if ((errno == EINTR && !alarm_rised) || errno == EAGAIN) {
xusleep(250000);
continue;
}
--
2.10.2
signature.asc
Description: PGP signature
