X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzpool%2Fzpool_main.c;h=cf8d5ed6060263094ebd74332169b82974f6fe33;hb=44867b6d6effc1628dd00c36821ab044f89fb988;hp=312f15753144ad74a3944b6cd9a1e919aa77298c;hpb=ba367276d84e126dc3a13677c286539d0019e3b8;p=zfs.git

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index 312f157..cf8d5ed 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -1647,6 +1647,7 @@ int
 zpool_do_import(int argc, char **argv)
 {
 	char **searchdirs = NULL;
+	char *env, *envdup = NULL;
 	int nsearch = 0;
 	int c;
 	int err = 0;
@@ -1846,6 +1847,30 @@ zpool_do_import(int argc, char **argv)
 		idata.unique = B_TRUE;
 	}
 
+	/*
+	 * Check the environment for the preferred search path.
+	 */
+	if ((searchdirs == NULL) && (env = getenv("ZPOOL_IMPORT_PATH"))) {
+		char *dir;
+
+		envdup = strdup(env);
+
+		dir = strtok(envdup, ":");
+		while (dir != NULL) {
+			if (searchdirs == NULL) {
+				searchdirs = safe_malloc(sizeof (char *));
+			} else {
+				char **tmp = safe_malloc((nsearch + 1) *
+				    sizeof (char *));
+				bcopy(searchdirs, tmp, nsearch *
+				    sizeof (char *));
+				free(searchdirs);
+				searchdirs = tmp;
+			}
+			searchdirs[nsearch++] = dir;
+			dir = strtok(NULL, ":");
+		}
+	}
 
 	idata.path = searchdirs;
 	idata.paths = nsearch;
@@ -1882,6 +1907,8 @@ zpool_do_import(int argc, char **argv)
 	if (err == 1) {
 		if (searchdirs != NULL)
 			free(searchdirs);
+		if (envdup != NULL)
+			free(envdup);
 		nvlist_free(policy);
 		return (1);
 	}
@@ -1984,6 +2011,8 @@ error:
 	nvlist_free(policy);
 	if (searchdirs != NULL)
 		free(searchdirs);
+	if (envdup != NULL)
+		free(envdup);
 
 	return (err ? 1 : 0);
 }