rng-tools: Only install one set of init scripts
PATCH 1/1 rng-tools: Only install one set of init scripts
From: Aníbal Limón <[email protected]>
Check if systemd is enabled to install .service file only instead of service and sysvinit files because it will to rngd service twice by systemd compatibility.
One called rng-tools.service (sysv compat) and another rngd.service.
...
root@:~# ps | grep rng 23 root 0 SW [hwrng] 13109 root 3528 R /usr/sbin/rngd -f -r /dev/hwrng 13117 root 2348 S grep rng 29418 root 12756 S /usr/sbin/rngd -r /dev/hwrng ...
--- .../rng-tools/rng-tools_6.15.bb | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-)
meta/recipes-support/rng-tools/rng-tools_6.15.bb +21 -14
@@ -17,7 +17,12 @@ SRCREV = "381f69828b782afda574f259c1b7549f48f9bb77" S = "${WORKDIR}/git" -inherit autotools update-rc.d systemd pkgconfig +inherit autotools pkgconfig + +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager', 'systemd', 'systemd', 'update-rc.d', d)} +SYSTEMD_SERVICE:${PN} = "rngd.service" +INITSCRIPT_NAME = "rng-tools" +INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." EXTRA_OECONF = "--without-rtlsdr"
@@ -29,11 +34,6 @@ PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentrop PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl" PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2 openssl" -INITSCRIPT_NAME = "rng-tools" -INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." - -SYSTEMD_SERVICE:${PN} = "rngd.service" - CFLAGS += " -DJENT_CONF_ENABLE_INTERNAL_TIMER " # Refer autogen.sh in rng-tools
@@ -43,14 +43,21 @@ do_configure:prepend() { do_install:append() { install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools - install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools - install -Dm 0644 ${WORKDIR}/rngd.service \ - ${D}${systemd_system_unitdir}/rngd.service - sed -i \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${sysconfdir}/init.d/rng-tools \ - ${D}${systemd_system_unitdir}/rngd.service + + if [ "${VIRTUAL-RUNTIME_init_manager}" = "systemd" ]; then + install -Dm 0644 ${WORKDIR}/rngd.service \ + ${D}${systemd_system_unitdir}/rngd.service + sed -i \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_system_unitdir}/rngd.service + else + install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools + sed -i \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${sysconfdir}/init.d/rng-tools + fi if [ "${@bb.utils.contains('PACKAGECONFIG', 'nistbeacon', 'yes', 'no', d)}" = "yes" ]; then sed -i \
Signature · 1 line
2.36.1
Em sáb., 9 de jul. de 2022 às 17:26, An?bal Lim?n <[email protected]> escreveu:
Quoted 8 lines
From: Aníbal Limón <[email protected]>
Check if systemd is enabled to install .service file only instead of service and sysvinit files because it will to rngd service twice by systemd compatibility.
One called rng-tools.service (sysv compat) and another rngd.service.
I think renaming the init script to use the same name as the .service file should fix it.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750