From 95003f709859fd104aad258e56bcc4dc5c8cfcf0 Mon Sep 17 00:00:00 2001 From: Thijs Cramer Date: Thu, 4 Feb 2016 22:34:49 +0100 Subject: [PATCH] Updated paths to scan when importing zpool(s) Added by-partlabel and by-partuuid to the default device search path. Made made device names in by-label more preferable. Signed-off-by: Thijs Cramer Signed-off-by: Brian Behlendorf Closes #3892 --- include/libzfs.h | 2 +- lib/libzfs/libzfs_import.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/libzfs.h b/include/libzfs.h index d07c9dd5d..33c87b441 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -64,7 +64,7 @@ extern "C" { */ #define DISK_LABEL_WAIT (30 * 1000) /* 30 seconds */ -#define DEFAULT_IMPORT_PATH_SIZE 7 +#define DEFAULT_IMPORT_PATH_SIZE 9 extern char *zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE]; /* diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c index d2eefff53..e4d0d37e4 100644 --- a/lib/libzfs/libzfs_import.c +++ b/lib/libzfs/libzfs_import.c @@ -1273,10 +1273,12 @@ char * zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE] = { "/dev/disk/by-vdev", /* Custom rules, use first if they exist */ "/dev/mapper", /* Use multipath devices before components */ + "/dev/disk/by-partlabel", /* Single unique entry set by user */ + "/dev/disk/by-partuuid", /* Generated partition uuid */ + "/dev/disk/by-label", /* Custom persistent labels */ "/dev/disk/by-uuid", /* Single unique entry and persistent */ "/dev/disk/by-id", /* May be multiple entries and persistent */ "/dev/disk/by-path", /* Encodes physical location and persistent */ - "/dev/disk/by-label", /* Custom persistent labels */ "/dev" /* UNSAFE device names will change */ };