From 170430d505c6436be9747cbee04e734eb7eff831 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Sun, 25 Feb 2018 20:15:06 +0000 Subject: [PATCH] Prevent getty(8) from looping indefinitely if the device node doesn't exist. This behaviour makes no sense for eg USB serial adapters, or USB device-side serial templates. This mostly reverts to pre-r135941 behaviour. Reviewed by: imp@ Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D14198 --- libexec/getty/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libexec/getty/main.c b/libexec/getty/main.c index c4f396d7f8a..78b352d1188 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -427,15 +427,17 @@ main(int argc, char *argv[]) static int opentty(const char *tty, int flags) { - int i; - int failopenlogged = 0; + int failopenlogged = 0, i, saved_errno; while ((i = open(tty, flags)) == -1) { + saved_errno = errno; if (!failopenlogged) { syslog(LOG_ERR, "open %s: %m", tty); failopenlogged = 1; } + if (saved_errno == ENOENT) + return 0; sleep(60); } if (login_tty(i) < 0) {