Make spl directory setable when building rpms and add --buildroot

[zfs.git] / lib / libzfs / libzfs_import.c

diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
index 22e46b4..791aaad 100644 (file)
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@@ -523,13 +523,12 @@ get_configs(libzfs_handle_t *hdl, pool_list_t *pl, boolean_t active_ok)
                                 *      version
                                 *      pool guid
                                 *      name
-                                *      pool txg (if available)
                                 *      comment (if available)
                                 *      pool state
                                 *      hostid (if available)
                                 *      hostname (if available)
                                 */
-                               uint64_t state, version, pool_txg;
+                               uint64_t state, version;
                                char *comment = NULL;
 
                                version = fnvlist_lookup_uint64(tmp,
@@ -545,11 +544,6 @@ get_configs(libzfs_handle_t *hdl, pool_list_t *pl, boolean_t active_ok)
                                fnvlist_add_string(config,
                                    ZPOOL_CONFIG_POOL_NAME, name);
 
-                               if (nvlist_lookup_uint64(tmp,
-                                   ZPOOL_CONFIG_POOL_TXG, &pool_txg) == 0)
-                                       fnvlist_add_uint64(config,
-                                           ZPOOL_CONFIG_POOL_TXG, pool_txg);
-
                                if (nvlist_lookup_string(tmp,
                                    ZPOOL_CONFIG_COMMENT, &comment) == 0)
                                        fnvlist_add_string(config,
@@ -980,7 +974,6 @@ err_blkid1:
 char *
 zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE] = {
        "/dev/disk/by-vdev",    /* Custom rules, use first if they exist */
-       "/dev/disk/zpool",      /* Custom rules, use first if they exist */
        "/dev/mapper",          /* Use multipath devices before components */
        "/dev/disk/by-uuid",    /* Single unique entry and persistent */
        "/dev/disk/by-id",      /* May be multiple entries and persistent */