From owner-p4-projects@FreeBSD.ORG  Fri Jul  4 13:14:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B228C106567B; Fri,  4 Jul 2008 13:14:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 708D41065670
	for <perforce@FreeBSD.org>; Fri,  4 Jul 2008 13:14:13 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5EFCE8FC26
	for <perforce@FreeBSD.org>; Fri,  4 Jul 2008 13:14:13 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m64DEDv8011340
	for <perforce@FreeBSD.org>; Fri, 4 Jul 2008 13:14:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m64DEDC6011338
	for perforce@freebsd.org; Fri, 4 Jul 2008 13:14:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 4 Jul 2008 13:14:13 GMT
Message-Id: <200807041314.m64DEDC6011338@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 144611 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jul 2008 13:14:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=144611

Change 144611 by hselasky@hselasky_laptop001 on 2008/07/04 13:13:46

	
	Improve booting from removable devices.

Affected files ...

.. //depot/projects/usb/src/sys/kern/vfs_mount.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/kern/vfs_mount.c#10 (text+ko) ====

@@ -58,6 +58,7 @@
 #include <sys/sysent.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
+#include <sys/cons.h>
 #include <vm/uma.h>
 
 #include <geom/geom.h>
@@ -148,10 +149,7 @@
 
 /* legacy find-root code */
 char		*rootdevnames[2] = {NULL, NULL};
-#ifndef ROOTDEVNAME
-#  define ROOTDEVNAME NULL
-#endif
-static const char	*ctrootdevname = ROOTDEVNAME;
+static const char	*ctrootdevname = NULL;
 
 /*
  * ---------------------------------------------------------------------
@@ -1613,7 +1611,10 @@
 vfs_mountroot(void)
 {
 	char *cp;
-	int error, i, asked = 0;
+	int error;
+	uint8_t i;
+	uint8_t asked = 0;
+	uint8_t timeout = 16;
 
 	root_mount_prepare();
 
@@ -1631,6 +1632,11 @@
 		asked = 1;
 	}
 
+ retry:
+#ifdef ROOTDEVNAME
+	ctrootdevname = ROOTDEVNAME;
+#endif
+
 	/*
 	 * The root filesystem information is compiled in, and we are
 	 * booted with instructions to use it.
@@ -1684,9 +1690,24 @@
 	 * Everything so far has failed, prompt on the console if we haven't
 	 * already tried that.
 	 */
-	if (!asked)
+	if (!asked) {
+		if (--timeout) {
+			/* 
+			 * Improve booting from removable devices
+			 * having USB in mind.
+			 */
+			printf("Waiting %u more seconds for boot "
+			       "device. Press any key for boot "
+			       "prompt.\r", timeout);
+			pause("WROOT", hz);
+			if (cncheckc() == -1) {
+				goto retry;
+			}
+			printf("\n");
+		}
 		if (!vfs_mountroot_ask())
 			goto mounted;
+	}
 
 	panic("Root mount failed, startup aborted.");