From 6ad1a57317defd82b0dd808093caddc826c7b371 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Tue, 21 Apr 2026 09:26:48 +0200 Subject: [PATCH] cc-containerd: use "/root/container" as default containers path Currently only the CCMP25 and CC95 will officially support containers. For these platforms, "/root" is a common path with enough free space. Signed-off-by: Isaac Hermida --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 1 + .../cc-container-mng/cc-container-mng_git.bb | 4 +--- .../container-host-config/container-host-config.bbappend | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 573c1c5f9..745f71501 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -116,6 +116,7 @@ BOOTLOADER_SEEK_BOOTPART ?= "0" # This is otherwise forced by systemd because of hard-coded paths # in systemd source code. ROOT_HOME ?= "/root" +CC_CONTAINER_PATH ?= "${ROOT_HOME}/cc-container" # Default IMAGE_FSTYPES for eMMC/NAND IMAGE_FSTYPES ?= "${@ \ diff --git a/meta-digi-containers/recipes-containers/cc-container-mng/cc-container-mng_git.bb b/meta-digi-containers/recipes-containers/cc-container-mng/cc-container-mng_git.bb index 7e8d85762..1fb45faef 100644 --- a/meta-digi-containers/recipes-containers/cc-container-mng/cc-container-mng_git.bb +++ b/meta-digi-containers/recipes-containers/cc-container-mng/cc-container-mng_git.bb @@ -45,9 +45,7 @@ do_install:append() { install -m 0644 ${S}/cc-container-mng.conf ${D}${sysconfdir}/cc-container-mng.conf sed -i \ - -e 's|"/var/lib/cc-container/cc-containers.conf"|"/mnt/data/cc-container/cc-containers.conf"|' \ - -e 's|"/var/lib/cc-container/state.json"|"/mnt/data/cc-container/state.json"|' \ - -e 's|"/var/lib/cc-container"|"/mnt/data/cc-container"|' \ + -e "s|\"/opt/cc-container|\"${CC_CONTAINER_PATH}|g" \ ${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 cac464f82..bf8586cb3 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 = "/mnt/data/cc-container/storage"|' \ + sed -i 's|^graphroot = ".*"|graphroot = "${CC_CONTAINER_PATH}/storage"|' \ ${D}${sysconfdir}/containers/storage.conf fi }