Date: Sun, 19 Sep 2010 14:21:39 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r212860 - head/sys/kern Message-ID: <201009191421.o8JELdNY004586@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Sun Sep 19 14:21:39 2010 New Revision: 212860 URL: http://svn.freebsd.org/changeset/base/212860 Log: Ignore DCD handling on /dev/console entirely. This makes /dev/console more fail-safe and prevents a potential console lock-up during boot. Discussed on: stable@ Tested by: koitsu@ MFC after: 1 week Modified: head/sys/kern/tty.c Modified: head/sys/kern/tty.c ============================================================================== --- head/sys/kern/tty.c Sun Sep 19 13:49:02 2010 (r212859) +++ head/sys/kern/tty.c Sun Sep 19 14:21:39 2010 (r212860) @@ -282,7 +282,8 @@ ttydev_open(struct cdev *dev, int oflags /* Wait for Carrier Detect. */ if (!TTY_CALLOUT(tp, dev) && (oflags & O_NONBLOCK) == 0 && - (tp->t_termios.c_cflag & CLOCAL) == 0) { + (tp->t_termios.c_cflag & CLOCAL) == 0 && + dev != dev_console) { while ((ttydevsw_modem(tp, 0, 0) & SER_DCD) == 0) { error = tty_wait(tp, &tp->t_dcdwait); if (error != 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009191421.o8JELdNY004586>