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 <[email protected]>
---
meta/recipes-core/busybox/busybox.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index 22972baaae..c85117efc8 100644
--- 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
}
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#229995):
https://lists.openembedded.org/g/openembedded-core/message/229995
Mute This Topic: https://lists.openembedded.org/mt/117467115/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
