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 <thijs.cramer@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3892

diff --git a/include/libzfs.h b/include/libzfs.h
index d07c9dd5d95e9c3ebe93269f879fa7c9515f45a4..33c87b441359706d31dcc9c2c08f69afdeae2f7a 100644 (file)
--- 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 d2eefff53945241b07abcb83e86f595f18ab9395..e4d0d37e48f45da8c9baf8e324ef1ab5369f28b4 100644 (file)
--- 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 */
 };