From owner-svn-src-head@FreeBSD.ORG  Tue Oct 19 18:32:01 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 984F0106566B;
	Tue, 19 Oct 2010 18:32:01 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 872DF8FC13;
	Tue, 19 Oct 2010 18:32:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9JIW1lw023312;
	Tue, 19 Oct 2010 18:32:01 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9JIW121023310;
	Tue, 19 Oct 2010 18:32:01 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201010191832.o9JIW121023310@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 19 Oct 2010 18:32:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214067 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Oct 2010 18:32:01 -0000

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;