From 8fd8336d1d0dad6d5828ac146028f6481c36284e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 6 Sep 2024 16:33:03 +0200 Subject: [run-virt] If CoW is enable,d always use DNBD3 Even if configured to use NFS/CIFS for VM access. --- .../opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc index 9f18d0ec..2a42aa87 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc @@ -169,11 +169,11 @@ setup_image_access_default() { # See if we should setup dnbd3 image access at all if ! isset SRC_IMG_RELATIVE; then writelog "\tCan't use dnbd3 as SRC_IMG_RELATIVE is not set" - elif isempty SLX_DNBD3_SERVERS || [ "x${SLX_VM_DNBD3}" != "xyes" ]; then - writelog "\tCan't use dnbd3 as no servers are given in config, or SLX_VM_DNBD3 is not set to yes" elif [ -n "$DMSD_COW_SESSION" ]; then writelog "Setting up DNBD3 CoW session" setup_dnbd3_cow + elif isempty SLX_DNBD3_SERVERS || ! is_on "${SLX_VM_DNBD3}"; then + writelog "\tCan't use dnbd3 as no servers are given in config, or SLX_VM_DNBD3 is not set to yes" elif setup_dnbd3_proxy; then writelog "\tImage setup done." elif ! check_dep dnbd3-fuse fusermount; then -- cgit v1.2.3-55-g7522