[meta-oe][PATCH] haveged: remove appending of the service file

[meta-oe][PATCH] haveged: remove appending of the service file

[Markus Fuchs]

Commit c1dd93296ff69c0c29dfaa22f586b8738e71ee52 ("haveged: use the
Fedora service file available from upstream") changed the systemd
service file from service.redhat to service.fedora.
The line "SuccessExitStatus=137 143" is available in service.fedora, so
it is not necessary to append SuccessExitStatus=137 to the service file.

Signed-off-by: Markus Fuchs <mklntf@gmail.com>
---
 meta-oe/recipes-extended/haveged/haveged_1.9.13.bb | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
index 50326ea2f..6d4979f4a 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.13.bb
@@ -32,15 +32,11 @@ SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} = "haveged.service"
 
 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,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged
-            chmod 755 ${D}${INIT_D_DIR}/haveged
-        fi
+    # Hybrid systemd-sysvinit distros must install the initscript manually
+    if ${@bb.utils.contains('DISTRO_FEATURES', ['systemd', 'sysvinit'], 'true', 'false', d)}; then
+        install -d ${D}${INIT_D_DIR}
+        sed -e "s,@SBINDIR@,${sbindir},g" <${S}/init.d/sysv.redhat >${D}${INIT_D_DIR}/haveged
+        chmod 755 ${D}${INIT_D_DIR}/haveged
     fi
 }
 
-- 
2.29.2