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 18df143fd..7e8d85762 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 @@ -41,20 +41,20 @@ do_install:append() { install -m 0644 ${WORKDIR}/cc-containerd.service ${D}${systemd_system_unitdir}/cc-containerd.service install -m 0644 ${WORKDIR}/cc-containerd-shutdown.service ${D}${systemd_system_unitdir}/cc-containerd-shutdown.service - install -d ${D}${sysconfdir}/cc-container - install -m 0644 ${S}/cc-container-mng.conf ${D}${sysconfdir}/cc-container/cc-container-mng.conf + install -d ${D}${sysconfdir} + 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"|' \ - ${D}${sysconfdir}/cc-container/cc-container-mng.conf + ${D}${sysconfdir}/cc-container-mng.conf } FILES:${PN}:append = " \ ${systemd_system_unitdir}/cc-containerd.service \ ${systemd_system_unitdir}/cc-containerd-shutdown.service \ - ${sysconfdir}/cc-container/cc-container-mng.conf \ + ${sysconfdir}/cc-container-mng.conf \ " -CONFFILES:${PN} += "${sysconfdir}/cc-container/cc-container-mng.conf" +CONFFILES:${PN} += "${sysconfdir}/cc-container-mng.conf" diff --git a/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd-shutdown.service b/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd-shutdown.service index c082b268d..1fd0d87e6 100644 --- a/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd-shutdown.service +++ b/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd-shutdown.service @@ -5,7 +5,7 @@ Before=shutdown.target reboot.target halt.target poweroff.target kexec.target [Service] Type=oneshot -ExecStart=/usr/bin/cc-containerd --config-file /etc/cc-container/cc-container-mng.conf --stop-managed-containers +ExecStart=/usr/bin/cc-containerd --config-file /etc/cc-container-mng.conf --stop-managed-containers RemainAfterExit=yes [Install] diff --git a/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd.service b/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd.service index 43962d1e6..26b5806ca 100644 --- a/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd.service +++ b/meta-digi-containers/recipes-containers/cc-container-mng/files/cc-containerd.service @@ -5,7 +5,7 @@ Wants=network.target [Service] Type=simple -ExecStart=/usr/bin/cc-containerd --config-file /etc/cc-container/cc-container-mng.conf +ExecStart=/usr/bin/cc-containerd --config-file /etc/cc-container-mng.conf # Stop only the daemon process; keep managed containers running. KillMode=process Restart=on-failure