From 45d18a1b6bcdc56d252b289d0d304b26799943b0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 3 Sep 2013 10:14:51 +0800 Subject: sysklogd: lower the ALTERNATIVE_PRIORITY in case of systemd The sysklogd package hasn't got systemd support yet. So in case of a systemd based system, the commands and corresponding configuration files should have a lower priority than that of the busybox's syslogd and klogd utilities. These two utilities from busybox have internal systemd support if CONFIG_FEATURE_SYSTEMD is enabled. And that config item is enabled by default. [YOCTO #5066] Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-extended/sysklogd/sysklogd.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-extended/sysklogd') diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 11673283f6..3a518103ea 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -38,7 +38,9 @@ do_install () { install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog } -ALTERNATIVE_PRIORITY = "100" +# sysklogd package has no internal systemd support, so we weigh busybox's +# sysklogd utility over it in case of systemd +ALTERNATIVE_PRIORITY = "${@base_contains('DISTRO_FEATURES','systemd','10','100',d)}" ALTERNATIVE_${PN} = "syslogd klogd syslog-init syslog-conf" -- cgit 1.2.3-korg