Skip to content

L
lxc
Unverified Commit 16e62936 by Stéphane Graber Committed by GitHub
Options

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

Fix lxc-oci template with loop backingstore
parents 0443ed92 bbd84ff1
Showing with 1 addition and 2 deletions
templates/lxc-oci.in
...@@ -348,8 +348,7 @@ fi ...@@ -348,8 +348,7 @@ fi
# shellcheck disable=SC2039 # shellcheck disable=SC2039
# shellcheck disable=SC2068 # shellcheck disable=SC2068
umoci --log=error unpack ${umoci_args[@]} --image "${DOWNLOAD_TEMP}:latest" "${LXC_ROOTFS}.tmp" umoci --log=error unpack ${umoci_args[@]} --image "${DOWNLOAD_TEMP}:latest" "${LXC_ROOTFS}.tmp"
rmdir "${LXC_ROOTFS}" find "${LXC_ROOTFS}.tmp/rootfs" -mindepth 1 -maxdepth 1 -exec mv '{}' "${LXC_ROOTFS}/" \;
mv "${LXC_ROOTFS}.tmp/rootfs" "${LXC_ROOTFS}"
OCI_CONF_FILE=$(getconfigpath "${DOWNLOAD_TEMP}" latest) OCI_CONF_FILE=$(getconfigpath "${DOWNLOAD_TEMP}" latest)
LXC_CONF_FILE="${LXC_PATH}/config" LXC_CONF_FILE="${LXC_PATH}/config"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment