From c7a7601c08d3f7db42dfca46e0ad8aa287df43da Mon Sep 17 00:00:00 2001 From: LOLi Date: Mon, 31 Jul 2017 20:07:05 +0200 Subject: 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 Signed-off-by: loli10K Closes #6426 --- tests/zfs-tests/include/libtest.shlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/zfs-tests/include/libtest.shlib') diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index b6ac41dfa..4395d2868 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -3460,7 +3460,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 -- cgit v1.2.3