[oe-commits] [meta-openembedded] 18/22: haveged: Fix missing initscript when both systemd and sysvinit are enabled

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit bc7972d7b9ef1e9e2ada0bbd7037140d1bc64fe3
Author: Andreas Oberritter <obi at opendreambox.org>
AuthorDate: Thu Nov 7 21:10:36 2019 +0100

    haveged: Fix missing initscript when both systemd and sysvinit are enabled
    
    Haveged's makefile installs either one or the other.
    
    Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-extended/haveged/haveged_1.9.6.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb
index 0189e19..a2f0d07 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb
@@ -35,6 +35,12 @@ do_install_append() {
     # The exit status is 143 when the service is stopped
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service
+        # Hybrid systemd-sysvinit distros must install the initscript manually
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+            install -d ${D}${INIT_D_DIR}
+            sed -e "s, at SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged
+            chmod 755 ${D}${INIT_D_DIR}/haveged
+        fi
     fi
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.