zpool: allow relative vdev paths

`zpool create` won't let you use relative paths to disks. This is annoying when you want to do: zpool create tank ./diskfile But have to do.. zpool create tank `pwd`/diskfile This fixes it. Signed-off-by: Tony Hutter <[email protected]>
openzfs · Feb 10, 2025 · a5b1f59 · a5b1f59
1 parent b8c73ab
commit a5b1f59
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/lib/libzutil/zutil_device_path.c b/lib/libzutil/zutil_device_path.c
@@ -57,6 +57,7 @@ int
 zfs_resolve_shortname(const char *name, char *path, size_t len)
 {
 	const char *env = getenv("ZPOOL_IMPORT_PATH");
+	char resolved_path[PATH_MAX];
 
 	if (env) {
 		for (;;) {
@@ -85,6 +86,15 @@ zfs_resolve_shortname(const char *name, char *path, size_t len)
 		}
 	}
 
+	/* The user may have passed a relative path like ./file1 for the vdev */
+	if (realpath(name, resolved_path) != NULL) {
+		if (access(resolved_path, F_OK) == 0) {
+			if (strlen(resolved_path) + 1 <= len) {
+				if (strlcpy(path, resolved_path, len) < len)
+					return (0); /* success */
+			}
+		}
+	}
 	return (errno = ENOENT);
 }