From 5826ba6968ef5cfb3b31b80009f3341a18d34331 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 11 Nov 2015 15:34:43 +0100 Subject: syslog-ng: add UPDATE_ALTERNATIVE for syslog-service Use ALTERNATIVE mechanism in OE to manage the syslog service to avoid conflicts with other syslog implementations like rsyslog or busybox. Signed-off-by: Steffen Sledz Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index a990bf8e1f..54f6920f5b 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -96,12 +96,18 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" # no syslog-init for systemd python () { - if 'sysvinit' in d.getVar("DISTRO_FEATURES", True).split(): + if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): pn = d.getVar('PN', True) sysconfdir = d.getVar('sysconfdir', True) d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200') d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) + + if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): + pn = d.getVar('PN', True) + d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) + d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir', True))) } INITSCRIPT_NAME = "syslog" -- cgit v1.2.3-54-g00ecf