summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2003-09-07 04:02:03 +0000
committerkrw <krw@openbsd.org>2003-09-07 04:02:03 +0000
commit7f70e4d3c919dd9eb1d98fced113100d992f82fe (patch)
tree54fd088b8563f00fae9c5900a12a90cb50e3fc02
parentNarrow a conditional in non-88110 area... (diff)
downloadwireguard-openbsd-7f70e4d3c919dd9eb1d98fced113100d992f82fe.tar.xz
wireguard-openbsd-7f70e4d3c919dd9eb1d98fced113100d992f82fe.zip
Fix system hangs some i386 machines experienced when booting with the
'-a' option. Closes PR #2122 and #3437. From Thorsten Glaser. ok deraadt@ henning@ weingart@.
-rw-r--r--sys/arch/i386/i386/autoconf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index a0bcd3c71f8..636c50b7601 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.47 2003/06/02 23:27:47 millert Exp $ */
+/* $OpenBSD: autoconf.c,v 1.48 2003/09/07 04:02:03 krw Exp $ */
/* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */
/*-
@@ -355,7 +355,9 @@ rootconf()
char name[128];
retry:
printf("root device? ");
+ cnpollc(TRUE);
getsn(name, sizeof name);
+ cnpollc(FALSE);
if (*name == '\0')
goto noask;
for (gc = genericconf; gc->gc_driver; gc++)