Merge pull request #3376 from toddnni/lxc-oci-fix

Fix lxc-oci template with loop backingstore
lxc · Apr 13, 2020 · 16e6293 · 16e6293
2 parents 0443ed9 + bbd84ff
commit 16e6293
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/templates/lxc-oci.in b/templates/lxc-oci.in
@@ -348,8 +348,7 @@ fi
 # shellcheck disable=SC2039
 # shellcheck disable=SC2068
 umoci --log=error unpack ${umoci_args[@]} --image "${DOWNLOAD_TEMP}:latest" "${LXC_ROOTFS}.tmp"
-rmdir "${LXC_ROOTFS}"
-mv "${LXC_ROOTFS}.tmp/rootfs" "${LXC_ROOTFS}"
+find "${LXC_ROOTFS}.tmp/rootfs" -mindepth 1 -maxdepth 1 -exec mv '{}' "${LXC_ROOTFS}/" \;
 
 OCI_CONF_FILE=$(getconfigpath "${DOWNLOAD_TEMP}" latest)
 LXC_CONF_FILE="${LXC_PATH}/config"