diff --git a/meta-digi-containers/recipes-containers/cc-container-mng/cc-container-mng_1.0.0.bb b/meta-digi-containers/recipes-containers/cc-container-mng/cc-container-mng_1.0.0.bb index f2e1ee91c..3ee04f3de 100644 --- a/meta-digi-containers/recipes-containers/cc-container-mng/cc-container-mng_1.0.0.bb +++ b/meta-digi-containers/recipes-containers/cc-container-mng/cc-container-mng_1.0.0.bb @@ -63,7 +63,7 @@ do_install() { ${D}${sysconfdir}/cc-container-mng.conf sed -i \ - -e "s|\"/opt/cc-container|\"${CC_CONTAINER_PATH}|g" \ + 's|"working_path".*|"working_path": "${CC_CONTAINER_PATH}",|' \ ${D}${sysconfdir}/cc-container-mng.conf } diff --git a/meta-digi-containers/recipes-containers/container-host-config/container-host-config.bbappend b/meta-digi-containers/recipes-containers/container-host-config/container-host-config.bbappend index bf8586cb3..a09d3133e 100644 --- a/meta-digi-containers/recipes-containers/container-host-config/container-host-config.bbappend +++ b/meta-digi-containers/recipes-containers/container-host-config/container-host-config.bbappend @@ -1,6 +1,6 @@ do_install:append() { if [ -f ${D}${sysconfdir}/containers/storage.conf ]; then - sed -i 's|^graphroot = ".*"|graphroot = "${CC_CONTAINER_PATH}/storage"|' \ + sed -i 's|^graphroot = ".*"|graphroot = "${CC_CONTAINER_PATH}/installed/podman"|' \ ${D}${sysconfdir}/containers/storage.conf fi } diff --git a/meta-digi-containers/recipes-containers/lxc/lxc-cc-container-path.inc b/meta-digi-containers/recipes-containers/lxc/lxc-cc-container-path.inc new file mode 100644 index 000000000..eb93c77e9 --- /dev/null +++ b/meta-digi-containers/recipes-containers/lxc/lxc-cc-container-path.inc @@ -0,0 +1,15 @@ +# Copyright (C) 2026, Digi International Inc. + +do_install:append() { + install -d ${D}${sysconfdir}/lxc + lxc_conf="${D}${sysconfdir}/lxc/lxc.conf" + touch "$lxc_conf" + + if grep -q '^[[:space:]]*lxc\.lxcpath[[:space:]]*=' "$lxc_conf"; then + sed -i \ + 's|^[[:space:]]*lxc\.lxcpath[[:space:]]*=.*|lxc.lxcpath = ${CC_CONTAINER_PATH}/installed/lxc|' \ + "$lxc_conf" + else + printf '%s\n' 'lxc.lxcpath = ${CC_CONTAINER_PATH}/installed/lxc' >> "$lxc_conf" + fi +} diff --git a/meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb b/meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb index 50785fc1d..21e8a9290 100644 --- a/meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb +++ b/meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb @@ -3,6 +3,7 @@ FILESEXTRAPATHS:prepend := "${COREBASE}/../meta-virtualization/recipes-containers/lxc/files:" require recipes-containers/lxc/lxc_git.bb +require recipes-containers/lxc/lxc-cc-container-path.inc DESCRIPTION = "Trimmed LXC runtime for dey-image-containers" diff --git a/meta-digi-containers/recipes-containers/lxc/lxc_git.bbappend b/meta-digi-containers/recipes-containers/lxc/lxc_git.bbappend new file mode 100644 index 000000000..83a154e15 --- /dev/null +++ b/meta-digi-containers/recipes-containers/lxc/lxc_git.bbappend @@ -0,0 +1,3 @@ +# Copyright (C) 2026, Digi International Inc. + +require recipes-containers/lxc/lxc-cc-container-path.inc