summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-02-06 13:15:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-06 15:30:44 +0000
commit3ca2ae1ea19a492df159252f2b49c950ac26dabb (patch)
treeabb1f5c3a77a753a64163dbfbaace35a1fe19bf9 /meta
parent618931eb0297391bd8e5346d297c2bcab7e088cf (diff)
downloadpoky-3ca2ae1ea19a492df159252f2b49c950ac26dabb.tar.gz
dbus: mask the dbus-1 init script if using systemd
If the image is built with both systemd and sysvinit there'll be a dbus-1 init script and a dbus service. This means systemd can try and launch both, which won't work. There's a systemctl mask to stop this in systemd-compat-units, but the logical place for it to be is in the dbus recipe so it can't be left out of an image. (From OE-Core rev: c910aa17689077362a25938aeebee7fb24057e30) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/dbus/dbus.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index cf17b62234..db47ede0be 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -62,6 +62,14 @@ RRECOMMENDS_${PN}-lib = "${PN}"
62FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" 62FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
63 63
64pkg_postinst_dbus() { 64pkg_postinst_dbus() {
65 # If both systemd and sysvinit are enabled, mask the dbus-1 init script
66 if ${@base_contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then
67 if [ -n "$D" ]; then
68 OPTS="--root=$D"
69 fi
70 systemctl $OPTS mask dbus-1.service
71 fi
72
65 if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then 73 if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
66 /etc/init.d/populate-volatile.sh update 74 /etc/init.d/populate-volatile.sh update
67 fi 75 fi