svn commit: r297190 - head/sys/kern

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Mar 22 13:46:01 2016
New Revision: 297190
URL: https://svnweb.freebsd.org/changeset/base/297190

Log:
  Wait for root mount tokens before showing the root mount prompt.
  This restores the pre-r290196 behaviour, eliminating the need to manually
  press '.' a couple of times to get USB to finish probing.
  
  Note that there's still something wrong with the console (character
  echoing doesn't quite work), and there's also a reported problem with
  BHyVe, but those two don't seem related to the problem above.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/kern/vfs_mountroot.c

Modified: head/sys/kern/vfs_mountroot.c
==============================================================================
--- head/sys/kern/vfs_mountroot.c	Tue Mar 22 13:32:34 2016	(r297189)
+++ head/sys/kern/vfs_mountroot.c	Tue Mar 22 13:46:01 2016	(r297190)
@@ -89,6 +89,7 @@ __FBSDID("$FreeBSD$");
 static int parse_mount(char **);
 static struct mntarg *parse_mountroot_options(struct mntarg *, const char *);
 static int sysctl_vfs_root_mount_hold(SYSCTL_HANDLER_ARGS);
+static void vfs_mountroot_wait(void);
 static int vfs_mountroot_wait_if_neccessary(const char *fs, const char *dev);
 
 /*
@@ -488,6 +489,8 @@ parse_dir_ask(char **conf)
 	char *mnt;
 	int error;
 
+	vfs_mountroot_wait();
+
 	printf("\nLoader variables:\n");
 	parse_dir_ask_printenv("vfs.root.mountfrom");
 	parse_dir_ask_printenv("vfs.root.mountfrom.options");