diff options
author | Brian Behlendorf <[email protected]> | 2016-02-19 15:43:43 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2016-03-09 10:39:22 -0800 |
commit | 7d11e37e5502e4dc473a9fe073779823d6ca2495 (patch) | |
tree | e40580f53ba6d20d3e6b1d063fa59e0fe2956a66 /include | |
parent | 048bb5bd4950b9cb5368ed93d273f0f36e439122 (diff) |
Require libblkid
Historically libblkid support was detected as part of configure
and optionally enabled. This was done because at the time support
for detecting ZFS pool vdevs had just be added to libblkid and
those updated packages were not yet part of many distributions.
This is no longer the case and any reasonably current distribution
will ship a version of libblkid which can detect ZFS pool vdevs.
This patch makes libblkid mandatory at build time and libblkid
the preferred method of scanning for ZFS pools. For distributions
which include a modern version of libblkid there is no change in
behavior. Explicitly scanning the default search paths is still
supported and can be enabled with the '-s' command line option.
Additionally making libblkid mandatory means that the 'zpool create'
command can reliably detect if a specified device has an existing
non-ZFS filesystem (ext4, xfs) and print a warning.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2448
Diffstat (limited to 'include')
-rw-r--r-- | include/libzfs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/libzfs.h b/include/libzfs.h index b8419e2e9..d07c9dd5d 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -391,6 +391,7 @@ typedef struct importargs { int can_be_active : 1; /* can the pool be active? */ int unique : 1; /* does 'poolname' already exist? */ int exists : 1; /* set on return if pool already exists */ + int scan : 1; /* prefer scanning to libblkid cache */ } importargs_t; extern nvlist_t *zpool_search_import(libzfs_handle_t *, importargs_t *); |