Fix lxc-oci template with loop backingstore

Move the content of rootfs inside OCI package to rootfs instead of replacing it, as the directory is used as the mountpoint. Tested with directory and loop backingstore. Signed-off-by: Toni Ylenius <toni.ylenius@iki.fi>

Fix lxc-oci template with loop backingstore
bbd84ff1 · Toni Ylenius · 0443ed92 · bbd84ff1
Commit bbd84ff1 authored Apr 12, 2020 by Toni Ylenius
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

lxc-oci.in templates/lxc-oci.in +1 -2

No files found.
--- 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"