@@ -65,8 +65,7 @@ while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0
65export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
65export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
67/sbin/initctl start dbus
67/sbin/initctl start dbus
68−. /var/lib/lightdm/.cache/upstart/dbus-session
68+export DBUS_SESSION_BUS_ADDRESS="$(/sbin/initctl get-env DBUS_SESSION_BUS_ADDRESS)"
69−[ -n "$DBUS_SESSION_BUS_ADDRESS" ] && export DBUS_SESSION_BUS_ADDRESS
71# We disable ofono using pulse. It causes problems with racing with the user's
70# We disable ofono using pulse. It causes problems with racing with the user's
72# pulse. We need to come up with a better long-term fix for this, because we
71# pulse. We need to come up with a better long-term fix for this, because we