rng-tools: remove duplicate initscript and wait for module load
PATCH 1/1 rng-tools: remove duplicate initscript and wait for module load
Since Arago still has a mix of SysVinit iniscripts and systemd unit files, it enables both of the DISTRO_FEATURES, resulting in some duplication. It appears that rngd currently has a problem handling signals when forked in daemon mode. Hence, drop SysVinit initscript in favor of systemd service, as the latter one starts rngd in foreground. Also, add udev dependency rule on omap_rng module.
--- .../recipes-support/rng-tools/rng-tools/rngd.rules | 1 + .../recipes-support/rng-tools/rng-tools_%.bbappend | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend
meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules new file +1 -0
@@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="module", KERNEL=="omap_rng", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend new file +13 -0
@@ -0,0 +1,13 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PR_append = ".arago0" + +SRC_URI += "file://rngd.rules" + +do_install_append() { + # remove duplicate initscript + rm -f ${D}${sysconfdir}/init.d/rng-tools + + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m0644 ${WORKDIR}/rngd.rules ${D}${sysconfdir}/udev/rules.d/ +}
Signature · 1 line
2.7.4
I manually made these changes to an existing filesystem, rebooted a few times, and observed the service status. The service was up every time and there was no delay in the service terminating when rebooting.
Quoted 40 lines · Denys Dmytriyenko
Since Arago still has a mix of SysVinit iniscripts and systemd unit files, it enables both of the
DISTRO_FEATURES, resulting in some duplication. It appears that rngd currently has a problem handling signals when forked in daemon mode. Hence, drop SysVinit initscript in favor of systemd service, as the latter one starts rngd in foreground. Also, add udev dependency rule onomap_rngmodule.Signed-off-by Denys Dmytriyenko <[email protected]>--- .../recipes-support/rng-tools/rng-tools/rngd.rules | 1 + .../recipes-support/rng-tools/rng-tools_%.bbappend | 13 +++++++++++++ 2 files changed, 14 insertions(+)create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend
meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules new file +1
-0@@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="module", KERNEL=="omap_rng", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend new file +13
-0@@ -0,0 +1,13 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PR_append = ".arago0" + +SRC_URI += "file://rngd.rules" + +do_install_append() { + # remove duplicate initscript + rm -f ${D}${sysconfdir}/init.d/rng-tools + + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m0644 ${WORKDIR}/rngd.rules ${D}${sysconfdir}/udev/rules.d/ +}
I now tested this in a build. It fails when creating the rootfs. The update-rc.d pre/post inst is still defined in the package, so package configuration fails because the initscript is not found.
This can be resolved by setting INHIBIT_UPDATERCD_BBCLASS in the rng-tools bbappend.
- Jake
Quoted 48 lines · Jacob Stiffler
I manually made these changes to an existing filesystem, rebooted a few times, and observed the service status. The service was up every time and there was no delay in the service terminating when rebooting.
Tested-by Jacob Stiffler <[email protected]>Quoted 43 lines · Denys Dmytriyenko
Since Arago still has a mix of SysVinit iniscripts and systemd unit files, it enables both of the
DISTRO_FEATURES, resulting in some duplication. It appears that rngd currently has a problem handling signals when forked in daemon mode. Hence, drop SysVinit initscript in favor of systemd service, as the latter one starts rngd in foreground. Also, add udev dependency rule onomap_rngmodule.Signed-off-by Denys Dmytriyenko <[email protected]>---
.../recipes-support/rng-tools/rng-tools/rngd.rules | 1 + .../recipes-support/rng-tools/rng-tools_%.bbappend | 13
+++++++++++++2 files changed, 14 insertions(+)create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules create mode 100644 meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend
meta-arago-distro/recipes-support/rng-tools/rng-tools/rngd.rules new file +1
-0@@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="module", KERNEL=="omap_rng",TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
meta-arago-distro/recipes-support/rng-tools/rng-tools_%.bbappend new file +12
-0@@ -0,0 +1,13 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PR_append = ".arago0" + +SRC_URI += "file://rngd.rules" + +do_install_append() { + # remove duplicate initscript + rm -f ${D}${sysconfdir}/init.d/rng-tools + + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m0644 ${WORKDIR}/rngd.rules${D}${sysconfdir}/udev/rules.d/
+}