tests/storage-vm: replace snap restart by systemctl restart (#329)

Workaround for https://bugs.launchpad.net/snapd/+bug/2028141 and https://bugs.launchpad.net/snapd/+bug/2083961
canonical · Oct 25, 2024 · cd985c3 · cd985c3
2 parents 94da399 + 10d599e
commit cd985c3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tests/storage-vm b/tests/storage-vm
@@ -21,10 +21,10 @@ 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
-    snap restart lxd
+    systemctl restart snap.lxd.daemon.service
 
     if command -v zfs; then
         apt-get autopurge -y zfsutils-linux
@@ -51,7 +51,7 @@ if echo "${poolDriverList}" | grep -qwF "zfs" && grep -qF zfs.external /snap/lxd
 
     echo "==> Use internal ZFS tools"
     snap unset lxd zfs.external
-    snap restart lxd
+    systemctl restart snap.lxd.daemon.service
 else
     echo "==> Skipping zfs.external test"
 fi