up to 1.14.10

[packages/dbus.git] / dbus-daemon-1-profile.d-sh

diff --git a/dbus-daemon-1-profile.d-sh b/dbus-daemon-1-profile.d-sh
index 31f2bc15892b3b328dc14969af4ef1ca1d5b166c..45fec817fc8cb4cd93cec7345a6ed42f2abdb5d5 100644 (file)
--- a/dbus-daemon-1-profile.d-sh
+++ b/dbus-daemon-1-profile.d-sh
@@ -1,8 +1,28 @@
+#! /bin/sh
 
-if [ -f /usr/bin/dbus-launch ]; then
-    if [ -f /var/run/dbus.pid ]; then
-       if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-           eval `dbus-launch --sh-syntax --exit-with-session`
-       fi    
-    fi
+[ -x /usr/bin/dbus-launch -a -f /var/run/dbus.pid ] || return
+
+# Get configuration
+. /etc/sysconfig/messagebus
+
+# Taken from rc-scripts
+is_yes()
+{
+       # Check value
+       case "$1" in
+         yes|Yes|YES|true|True|TRUE|on|On|ON|Y|y|1)
+               # true returns zero
+               return 0
+               ;;
+         *)
+               # false returns one
+               return 1
+               ;;
+       esac
+}
+
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && is_yes "${SESSION_BUS_PROFILE_D}"; then
+       eval `dbus-launch --sh-syntax --exit-with-session`
 fi
+
+unset -f is_yes