From owner-svn-src-stable-8@FreeBSD.ORG Sat Jun 2 19:01:47 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90AC7106566B; Sat, 2 Jun 2012 19:01:47 +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 7B8098FC1D; Sat, 2 Jun 2012 19:01:47 +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 q52J1lpS007416; Sat, 2 Jun 2012 19:01:47 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q52J1loJ007414; Sat, 2 Jun 2012 19:01:47 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201206021901.q52J1loJ007414@svn.freebsd.org> From: Andriy Gapon Date: Sat, 2 Jun 2012 19:01:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236471 - stable/8/cddl/contrib/opensolaris/lib/libzfs/common X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2012 19:01:47 -0000 Author: avg Date: Sat Jun 2 19:01:47 2012 New Revision: 236471 URL: http://svn.freebsd.org/changeset/base/236471 Log: MFC r235479: zpool_find_import_impl: another /dev//dsk -> /dev fix PR: bin/155104 Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Directory Properties: stable/8/cddl/contrib/opensolaris/ (props changed) Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Sat Jun 2 18:59:18 2012 (r236470) +++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Sat Jun 2 19:01:47 2012 (r236471) @@ -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;