Patchwork [ross/systemd,2/2] dbus: disable initscript when systemd is active

login
register
mail settings
Submitter Andreas Oberritter
Date March 18, 2013, 3:49 p.m.
Message ID <1363621784-22855-2-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/46399/
State New
Headers show

Comments

Andreas Oberritter - March 18, 2013, 3:49 p.m.
* systemd's unit is called "dbus", which doesn't
  match the name of the initscript

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-core/dbus/dbus.inc |    3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index affffbc..3769a68 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -88,6 +88,9 @@  do_install() {
 		install -d ${D}${sysconfdir}/init.d
 		sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh
 		install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1
+		if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+			ln -sf /dev/null ${D}${systemd_unitdir}/system/dbus-1.service
+		fi
 	fi
 
 	install -d ${D}${sysconfdir}/default/volatiles