]> code.ossystems Code Review - openembedded-core.git/commit
dbus: mask the dbus-1 init script if using systemd
authorRoss Burton <ross.burton@intel.com>
Thu, 6 Feb 2014 13:15:39 +0000 (13:15 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 6 Feb 2014 15:23:40 +0000 (15:23 +0000)
commitc910aa17689077362a25938aeebee7fb24057e30
treeb015f12ace3d86d7a504c5fcda545d124b5d5c15
parentdcf228fe69bfee4e22baad477ad407248c0f9cdb
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/dbus/dbus.inc