Patchwork [2/2] sysklogd: lower the ALTERNATIVE_PRIORITY in case of systemd

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Sept. 3, 2013, 2:12 a.m.
Message ID <cf1e3a4f96df954ed8b4f8909e8bc07f29d48f54.1378174301.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/57247/
State Accepted
Commit 45d18a1b6bcdc56d252b289d0d304b26799943b0
Headers show

Comments

Qi.Chen@windriver.com - Sept. 3, 2013, 2:12 a.m.
From: Chen Qi <Qi.Chen@windriver.com>

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 <Qi.Chen@windriver.com>
---
 meta/recipes-extended/sysklogd/sysklogd.inc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 1167328..3a51810 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"