busybox: fix a incomplete condition check

When deleting syslog sysvinit related config files, also check if
'systemd' is being enabled, after the change, it behaves same with the
check logic in rm_sysvinit_initddir.

${sysconfdir}/syslog.conf is also a sysvinit related config file, also
delete it.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 22972baaae4c31f2d1324d7d372ccc9e585117c9..c85117efc80f3d46b84787c060d7110bfafe5c48 100644 (file)
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -358,8 +358,10 @@ do_install () {
        fi
 
        # Remove the sysvinit specific configuration file for systemd systems to avoid confusion
-       if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)} &&
+               ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
                rm -f ${D}${sysconfdir}/syslog-startup.conf
+               rm -f ${D}${sysconfdir}/syslog.conf
        fi
 }