Skip to contentSkip to conversation

busybox: fix a incomplete condition check

PATCH New Ming Liu 1 participant 1 message Jan 26

lore
Share & tools
lore

Ming Liu

author
#0 lore raw

PATCH 1/1 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.

---
 meta/recipes-core/busybox/busybox.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-core/busybox/busybox.inc +3 -1
index 22972baaae..c85117efc8 100644
@@ -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
 }
 
Signature · 1 line
2.43.0