From bb9d5bbbcb62d8ca6c9366e39ec357c503d1fa2b Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Mon, 24 Sep 2007 15:16:43 +0000
Subject: dbus: add reload action

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2777 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/dbus/dbus-1.0.2/dbus-1.init | 17 +++++++++++++++--
 meta/packages/dbus/dbus_1.0.2.bb          |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/meta/packages/dbus/dbus-1.0.2/dbus-1.init b/meta/packages/dbus/dbus-1.0.2/dbus-1.init
index 88fe7e33db..0725083c69 100644
--- a/meta/packages/dbus/dbus-1.0.2/dbus-1.init
+++ b/meta/packages/dbus/dbus-1.0.2/dbus-1.init
@@ -76,6 +76,16 @@ shut_it_down()
   rm -f $PIDFILE
 }
 
+reload_it()
+{
+  echo -n "Reloading $DESC config: "
+  dbus-send --print-reply --system --type=method_call \
+            --dest=org.freedesktop.DBus \
+            / org.freedesktop.DBus.ReloadConfig > /dev/null
+  # hopefully this is enough time for dbus to reload it's config file.
+  echo "done."
+}
+
 case "$1" in
   start)
     start_it_up
@@ -83,13 +93,16 @@ case "$1" in
   stop)
     shut_it_down
   ;;
-  restart|force-reload)
+  reload|force-reload)
+    reload_it
+  ;;
+  restart)
     shut_it_down
     sleep 1
     start_it_up
   ;;
   *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
     exit 1
   ;;
 esac
diff --git a/meta/packages/dbus/dbus_1.0.2.bb b/meta/packages/dbus/dbus_1.0.2.bb
index 0cfb4ebf46..7bf0a8634d 100644
--- a/meta/packages/dbus/dbus_1.0.2.bb
+++ b/meta/packages/dbus/dbus_1.0.2.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
-- 
cgit v1.2.3-54-g00ecf