Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cccs: switch daemon init method to inittab for sysvinit-based systems 

This commit updates the CCCS recipe to support `inittab`-based daemon
initialization for platforms using `sysvinit`, such as ConnectCore 6UL.

By switching to `inittab` for daemon control in these systems, we guarantee
automatic relaunch of `cccsd` if it exits unexpectedly (this functionality was
previously only available with `systemd`)

This improves reliability and aligns behavior across `systemd` and non-`systemd`
platforms.

See Confluence question
"Why won't CC6-UL rejoin DRM after a planned DRM outage?"
(https://onedigi.atlassian.net/wiki/plugins/servlet/ac/com.atlassian.confluence.plugins.confluence-questions/globalQuestionsViewer?ac.com.atlassian.confluence.plugins.confluence-questions.path=/questions/236710985798)

Signed-off-by: Tatiana Leon <Tatiana.Leon@digi.com>
(cherry picked from commit 5c667641a88437795fea3097ca5cf76c22de47c1)
This commit is contained in:
Tatiana Leon 2025-05-19 10:54:11 +02:00
parent 7614d4ab39
commit b154154a7e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta-digi-dey/recipes-digi/cccs/cccs_git.bb
View File

@ -22,6 +22,7 @@ SRC_URI = " \
${CC_GIT_URI};branch=${SRCBRANCH} \ ${CC_GIT_URI};branch=${SRCBRANCH} \
file://cccsd-init \ file://cccsd-init \
file://cccsd.service \ file://cccsd.service \
file://cccsd.tab \
file://cccs-gs-demo-init \ file://cccs-gs-demo-init \
file://cccs-gs-demo.service \ file://cccs-gs-demo.service \
" "
@ -50,16 +51,21 @@ inherit pkgconfig systemd update-rc.d
do_install() { do_install() {
oe_runmake DESTDIR=${D} install oe_runmake DESTDIR=${D} install
install -d ${D}${sysconfdir}/init.d/
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
# Install systemd unit files # Install systemd unit files
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/cccsd.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/cccsd.service ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/cccs-gs-demo.service ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/cccs-gs-demo.service ${D}${systemd_unitdir}/system/
install -m 755 ${WORKDIR}/cccsd-init ${D}${sysconfdir}/cccsd
ln -sf /etc/cccsd ${D}${sysconfdir}/init.d/cccsd
else
install -d ${D}${sysconfdir}/inittab.d/
install -m 755 ${WORKDIR}/cccsd.tab ${D}${sysconfdir}/inittab.d/cccsd.tab
fi fi
install -d ${D}${sysconfdir}/init.d/
install -m 755 ${WORKDIR}/cccsd-init ${D}${sysconfdir}/cccsd
ln -sf /etc/cccsd ${D}${sysconfdir}/init.d/cccsd
install -m 755 ${WORKDIR}/cccs-gs-demo-init ${D}${sysconfdir}/cccs-gs-demo install -m 755 ${WORKDIR}/cccs-gs-demo-init ${D}${sysconfdir}/cccs-gs-demo
ln -sf /etc/cccs-gs-demo ${D}${sysconfdir}/init.d/cccs-gs-demo ln -sf /etc/cccs-gs-demo ${D}${sysconfdir}/init.d/cccs-gs-demo
@ -100,9 +106,7 @@ REMOVE_POSTINST_RPN = "${PN}-daemon"
inherit ${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "remove-pkg-postinst-ontarget", \ inherit ${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "remove-pkg-postinst-ontarget", \
oe.utils.ifelse(d.getVar("CCCS_CONF_PATH"), "remove-pkg-postinst-ontarget", ""), d)} oe.utils.ifelse(d.getVar("CCCS_CONF_PATH"), "remove-pkg-postinst-ontarget", ""), d)}
INITSCRIPT_PACKAGES = "${PN}-daemon ${PN}-gs-demo" INITSCRIPT_PACKAGES = "${PN}-gs-demo"
INITSCRIPT_NAME:${PN}-daemon = "cccsd"
INITSCRIPT_PARAMS:${PN}-daemon = "defaults 19 81"
INITSCRIPT_NAME:${PN}-gs-demo = "cccs-gs-demo" INITSCRIPT_NAME:${PN}-gs-demo = "cccs-gs-demo"
INITSCRIPT_PARAMS:${PN}-gs-demo = "defaults 81 19" INITSCRIPT_PARAMS:${PN}-gs-demo = "defaults 81 19"
@ -127,6 +131,7 @@ FILES:${PN}-daemon = " \
${sysconfdir}/cccsd \ ${sysconfdir}/cccsd \
${sysconfdir}/cccs.conf \ ${sysconfdir}/cccs.conf \
${sysconfdir}/init.d/cccsd \ ${sysconfdir}/init.d/cccsd \
${sysconfdir}/inittab/cccsd.tab \
" "
FILES:${PN}-gs-demo = " \ FILES:${PN}-gs-demo = " \

1
meta-digi-dey/recipes-digi/cccs/files/cccsd.tab Normal file
View File

@ -0,0 +1 @@
cccs:2345:respawn:/usr/bin/cccsd -d > /dev/null 2>&1