summaryrefslogtreecommitdiffstats
path: root/tests/zfs-tests/include
diff options
context:
space:
mode:
authorLOLi <[email protected]>2017-07-31 20:07:05 +0200
committerTony Hutter <[email protected]>2017-08-02 11:21:14 -0700
commit20c88dc3efd7e83aa872fad786f9e74ab5e350b9 (patch)
tree81af4b343f02ca9e6de86f6804052b19631afd27 /tests/zfs-tests/include
parent0c8fedeb355b00322f2785442929d29591cf00c8 (diff)
Fix volmode=none property behavior at import time
At import time spa_import() calls zvol_create_minors() directly: with the current implementation we have no way to avoid device node creation when volmode=none. Fix this by enforcing volmode=none directly in zvol_alloc(). Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: loli10K <[email protected]> Closes #6426
Diffstat (limited to 'tests/zfs-tests/include')
-rw-r--r--tests/zfs-tests/include/libtest.shlib2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
index 88594c201..be71c0d75 100644
--- a/tests/zfs-tests/include/libtest.shlib
+++ b/tests/zfs-tests/include/libtest.shlib
@@ -3425,7 +3425,7 @@ function swap_setup
typeset swapdev=$1
if is_linux; then
- log_must mkswap $swapdev > /dev/null 2>&1
+ log_must eval "mkswap $swapdev > /dev/null 2>&1"
log_must swapon $swapdev
else
log_must swap -a $swapdev