summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2020-05-07 11:00:02 +0200
committerJonathan Bauer2020-05-07 11:00:02 +0200
commitd300a588b09915c21d2ee16d0c832fad4895037a (patch)
treecf0314341e314880d87ec050668503f548c6ece3
parentMerge branch 'master' into nobash-merge (diff)
parent[dnbd3-rootfs] default to xmount for qcow2 (diff)
downloadsystemd-init-d300a588b09915c21d2ee16d0c832fad4895037a.tar.gz
systemd-init-d300a588b09915c21d2ee16d0c832fad4895037a.tar.xz
systemd-init-d300a588b09915c21d2ee16d0c832fad4895037a.zip
Merge branch 'master' into nobash-merge
-rwxr-xr-xbuilder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh
index b38fccbb..e46bc201 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -82,7 +82,7 @@ done
# endregion
# region unpack dnbd3 image
-[ -z "$SLX_QCOW_HANDLER" ] && SLX_QCOW_HANDLER="kernel"
+[ -z "$SLX_QCOW_HANDLER" ] && SLX_QCOW_HANDLER="xmount"
if [ "$SLX_QCOW_HANDLER" = "xmount" ]; then
read_only_device="$(container_unpack_xmount "$_dnbd3_dev")"
elif [ "$SLX_QCOW_HANDLER" = "kernel" ]; then