ソースを参照

dbus: fix startup

Waldemar Brodkorb 9 年 前
コミット
5d870ac66b
2 ファイル変更3 行追加2 行削除
  1. 2 1
      package/dbus/Makefile
  2. 1 1
      package/dbus/files/dbus.init

+ 2 - 1
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

+ 1 - 1
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)