svn commit: r214067 - head/sys/kern

[Andrey V. Elsukov]

Author: ae
Date: Tue Oct 19 18:32:01 2010
New Revision: 214067
URL: http://svn.freebsd.org/changeset/base/214067

Log:
  ZFS pool name is not a real device in devfs. Do not wait for
  device appear when mounting root from ZFS.
  
  Reviewed by:	marcel
  Approved by:	mav (mentor)

Modified:
  head/sys/kern/vfs_mountroot.c

Modified: head/sys/kern/vfs_mountroot.c
==============================================================================
--- head/sys/kern/vfs_mountroot.c	Tue Oct 19 17:49:55 2010	(r214066)
+++ head/sys/kern/vfs_mountroot.c	Tue Oct 19 18:32:01 2010	(r214067)
@@ -713,7 +713,8 @@ parse_mount(char **conf)
 		goto out;
 	}
 
-	if (dev[0] != '\0' && !parse_mount_dev_present(dev)) {
+	if (strcmp(fs, "zfs") != 0 && dev[0] != '\0' &&
+	    !parse_mount_dev_present(dev)) {
 		printf("mountroot: waiting for device %s ...\n", dev);
 		delay = hz / 10;
 		timeout = root_mount_timeout * hz;