From 10d599e92da1bdc97ec56471714c0687a7cadb32 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 24 Oct 2024 11:11:10 -0400 Subject: [PATCH] tests/storage-vm: improve detection of zfs.external support Don't look for the snap option name (`zfs.external`) but for the config variable name (`zfs_external`). Improve `grep` args while at it. Signed-off-by: Simon Deziel --- tests/storage-vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/storage-vm b/tests/storage-vm index f5ffc766..67a4d9c6 100755 --- a/tests/storage-vm +++ b/tests/storage-vm @@ -21,7 +21,7 @@ MiB="$((1024 * 1024))" GiB="$((1024 * MiB))" # zfs.external -if echo "${poolDriverList}" | grep -qwF "zfs" && grep -qF zfs.external /snap/lxd/current/commands/daemon.start; then +if echo "${poolDriverList}" | grep -qwF "zfs" && grep -qwFm1 zfs_external /snap/lxd/current/commands/daemon.start; then echo "==> Use external ZFS tools" snap set lxd zfs.external=true systemctl restart snap.lxd.daemon.service