From owner-cvs-all Mon Jan 13 13:28:26 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D73837B401; Mon, 13 Jan 2003 13:28:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8B3343EB2; Mon, 13 Jan 2003 13:28:24 -0800 (PST) (envelope-from imp@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0DLSOfh046953; Mon, 13 Jan 2003 13:28:24 -0800 (PST) (envelope-from imp@repoman.freebsd.org) Received: (from imp@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0DLSOKb046952; Mon, 13 Jan 2003 13:28:24 -0800 (PST) Message-Id: <200301132128.h0DLSOKb046952@repoman.freebsd.org> From: Warner Losh Date: Mon, 13 Jan 2003 13:28:24 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/boot/i386/boot2 boot2.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG imp 2003/01/13 13:28:24 PST Modified files: sys/boot/i386/boot2 boot2.c Log: Fix interactive booting: o Revision 1.38 introduced the -n flag. It conflicted with the RB_BOOTINFO flag, so was in effect always on. Change the -n flag to be bit 0x1c instead of 0x1f. This also had the consequence that a mal-formed /boot.config would render the system unbootable because the user was unable to enter anything at all on the command line. o Remove the initialization of opt to be RB_BOOTINFO since we filter that bit out and do not otherwise use it. Reviewed by: jhb MFC after: 3 days Revision Changes Path 1.61 +4 -2 src/sys/boot/i386/boot2/boot2.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message