Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Thijs Cramer 2016-02-04 22:34:49 +01:00 committed by Brian Behlendorf
parent 7d11e37e55
commit 95003f7098
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libzfs.h
View File

@ -64,7 +64,7 @@ extern "C" {
*/ */
#define DISK_LABEL_WAIT (30 * 1000) /* 30 seconds */ #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]; extern char *zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE];
/* /*

4
lib/libzfs/libzfs_import.c
View File

@ -1273,10 +1273,12 @@ char *
zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE] = { zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE] = {
"/dev/disk/by-vdev", /* Custom rules, use first if they exist */ "/dev/disk/by-vdev", /* Custom rules, use first if they exist */
"/dev/mapper", /* Use multipath devices before components */ "/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-uuid", /* Single unique entry and persistent */
"/dev/disk/by-id", /* May be multiple entries and persistent */ "/dev/disk/by-id", /* May be multiple entries and persistent */
"/dev/disk/by-path", /* Encodes physical location and persistent */ "/dev/disk/by-path", /* Encodes physical location and persistent */
"/dev/disk/by-label", /* Custom persistent labels */
"/dev" /* UNSAFE device names will change */ "/dev" /* UNSAFE device names will change */
}; };