summaryrefslogtreecommitdiff
path: root/package/dbus
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-06-18 13:50:12 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2016-06-19 16:10:16 +0200
commit5d870ac66b3840e1ad55b2012c8859bce8790b63 (patch)
tree3d7151c5420606fba25ab538b29169c850b6daae /package/dbus
parent68fa4f1813a04b7f3774a7e809940e11364484f9 (diff)
dbus: fix startup
Diffstat (limited to 'package/dbus')
-rw-r--r--package/dbus/Makefile3
-rw-r--r--package/dbus/files/dbus.init2
2 files changed, 3 insertions, 2 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 34fe766e0..7b17fff5a 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -52,11 +52,12 @@ libdbus-install:
${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_LIBDBUS}/usr/lib
dbus-install:
- ${INSTALL_DIR} ${IDIR_DBUS}/etc \
+ ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/share \
${IDIR_DBUS}/usr/bin ${IDIR_DBUS}/usr/libexec
${INSTALL_BIN} ${WRKINST}/usr/libexec/dbus-daemon-launch-helper \
${IDIR_DBUS}/usr/libexec/
${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc
+ ${CP} ${WRKINST}/usr/share/dbus-1 ${IDIR_DBUS}/usr/share
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index c31f5e6ab..9f1b99f63 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -13,7 +13,7 @@ autostart)
start)
mkdir -p /var/run/dbus /var/lib
ln -sf /lib/dbus /var/lib/dbus
- /usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf
+ /usr/bin/dbus-daemon --system
;;
stop)
kill $(pgrep -f /usr/bin/dbus-daemon)