From 1c6b16454904cfd7ed2a64524f3f86a8562b677b Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 20 Oct 2021 15:44:25 +0200 Subject: [dnbd3-rootfs] Accept kernel and xloop, default to xloop --- modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh b/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh index f61bd7fe..e32595dc 100755 --- a/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -90,18 +90,18 @@ done # endregion # region unpack dnbd3 image -if ! [[ $SLX_QCOW_HANDLER =~ ^(kernel|xmount)?$ ]]; then - emergency_shell "Unsupported QCOW handler: $SLX_QCOW_HANDLER" \ - "Use either 'xmount' or 'kernel'." +if ! [[ $SLX_QCOW_HANDLER =~ ^(kernel|xloop|xmount)?$ ]]; then + emergency_shell "Unsupported QCOW handler: $SLX_QCOW_HANDLER" \ + "Use either 'xmount' or 'xloop'." fi if [ -z "$SLX_QCOW_HANDLER" ]; then - SLX_QCOW_HANDLER="xmount" - echo "SLX_QCOW_HANDLER='$SLX_QCOW_HANDLER'" >> /etc/openslx + SLX_QCOW_HANDLER="xloop" + echo "SLX_QCOW_HANDLER='$SLX_QCOW_HANDLER'" >> /etc/openslx fi -if [ "$SLX_QCOW_HANDLER" = "kernel" ]; then +if [[ $SLX_QCOW_HANDLER =~ ^kernel|xloop$ ]]; then read_only_device="$(container_unpack_xloop "$_dnbd3_dev")" fi -if [ -z "$read_only_device" ] || [ "$SLX_QCOW_HANDLER" = "xmount" ]; then +if [ -z "$read_only_device" ]; then read_only_device="$(container_unpack_xmount "$_dnbd3_dev")" fi -- cgit v1.2.3-55-g7522