summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2012-05-15 17:07:29 +0000
committeravg <avg@FreeBSD.org>2012-05-15 17:07:29 +0000
commit334fd301de999317143658eb7c39f2ca3ab21ce7 (patch)
treeec442d951096cf42826d41587f16e3125ec8c202
parent144694d0bb0ed952a16e2c6fcbdc42f2ecbb515e (diff)
downloadFreeBSD-src-334fd301de999317143658eb7c39f2ca3ab21ce7.zip
FreeBSD-src-334fd301de999317143658eb7c39f2ca3ab21ce7.tar.gz
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
-rw-r--r--cddl/contrib/opensolaris/cmd/zpool/zpool_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
index fe76250..5d1e454 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -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;
}
OpenPOWER on IntegriCloud