From owner-svn-src-head@FreeBSD.ORG  Tue May 15 17:07:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6ADCC1065673;
	Tue, 15 May 2012 17:07:30 +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 559E38FC1E;
	Tue, 15 May 2012 17:07:30 +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 q4FH7Uth096836;
	Tue, 15 May 2012 17:07:30 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4FH7UDU096834;
	Tue, 15 May 2012 17:07:30 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201205151707.q4FH7UDU096834@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 15 May 2012 17:07:30 +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: r235478 - head/cddl/contrib/opensolaris/cmd/zpool
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:07:30 -0000

Author: avg
Date: Tue May 15 17:07:29 2012
New Revision: 235478
URL: http://svn.freebsd.org/changeset/base/235478

Log:
  zpool_do_import: use /dev instead of /dev/dsk as a default
  
  This affects behavior of zpool import without -d option.
  
  Reported by:	Bruce Cran <bruce@cran.org.uk>
  Submitted by:	Fabian Keil <freebsd-listen@fabiankeil.de>
  MFC after:	2 weeks

Modified:
  head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue May 15 16:17:30 2012	(r235477)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue May 15 17:07:29 2012	(r235478)
@@ -1909,7 +1909,7 @@ zpool_do_import(int argc, char **argv)
 
 	if (searchdirs == NULL) {
 		searchdirs = safe_malloc(sizeof (char *));
-		searchdirs[0] = "/dev/dsk";
+		searchdirs[0] = "/dev";
 		nsearch = 1;
 	}