From owner-svn-src-head@FreeBSD.ORG  Tue May 15 17:11:00 2012
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 EEFA4106566B;
	Tue, 15 May 2012 17:11:00 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8F508FC1B;
	Tue, 15 May 2012 17:11:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4FHB0vw096982;
	Tue, 15 May 2012 17:11:00 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4FHB03W096980;
	Tue, 15 May 2012 17:11:00 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201205151711.q4FHB03W096980@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 15 May 2012 17:11:00 +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: r235479 -
	head/cddl/contrib/opensolaris/lib/libzfs/common
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, 15 May 2012 17:11:01 -0000

Author: avg
Date: Tue May 15 17:11:00 2012
New Revision: 235479
URL: http://svn.freebsd.org/changeset/base/235479

Log:
  zpool_find_import_impl: another /dev/dsk -> /dev fix
  
  This seems to fix zdb -e behavior.
  
  PR:		bin/155104
  Submitted by:	swell.k@gmail.com
  MFC after:	2 weeks

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Tue May 15 17:07:29 2012	(r235478)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Tue May 15 17:11:00 2012	(r235479)
@@ -1145,7 +1145,7 @@ zpool_find_import_impl(libzfs_handle_t *
 	char *end, **dir = iarg->path;
 	size_t pathleft;
 	nvlist_t *ret = NULL;
-	static char *default_dir = "/dev/dsk";
+	static char *default_dir = "/dev";
 	pool_list_t pools = { 0 };
 	pool_entry_t *pe, *penext;
 	vdev_entry_t *ve, *venext;