upstart

Merge lp:~ted/upstart/session-jobs into lp:upstart

  1. session-jobs
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 1513
Proposed branch: lp:~ted/upstart/session-jobs
Merge into: lp:upstart
Prerequisite: lp:~ted/upstart/dbus-configure-event
Diff against target: 56 lines (+35/-1)
3 files modified
extra/Makefile.am (+3/-1)
extra/conf-session/upstart-dbus-session-bridge.conf (+16/-0)
extra/conf-session/upstart-dbus-system-bridge.conf (+16/-0)
To merge this branch: bzr merge lp:~ted/upstart/session-jobs
Reviewer Review Type Date Requested Status
Upstart Reviewers Pending
Review via email: mp+172384@code.launchpad.net

Commit message

Add jobs for getting dbus events in the user session.

Description of the change

Creates a set of user session job configurations for the session and system bus to be able to get dbus events in the user session.

To post a comment you must log in.
lp:~ted/upstart/session-jobs updated
1503. By Ted Gould

Get the updated configuration branch

1504. By Ted Gould

Change to new configuration syntax

1505. By Ted Gould

Merging trunk to resolve conflicts

1506. By Ted Gould

Merge updated dbus-configure-event

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'extra/Makefile.am'
--- extra/Makefile.am 2013-07-18 14:12:13 +0000
+++ extra/Makefile.am 2013-07-24 04:43:28 +0000
@@ -20,7 +20,9 @@
20dist_sessions_DATA = \20dist_sessions_DATA = \
21 conf-session/upstart-event-bridge.conf \21 conf-session/upstart-event-bridge.conf \
22 conf-session/upstart-file-bridge.conf \22 conf-session/upstart-file-bridge.conf \
23 conf-session/re-exec.conf23 conf-session/re-exec.conf \
24 conf-session/upstart-dbus-session-bridge.conf \
25 conf-session/upstart-dbus-system-bridge.conf
2426
25sbin_PROGRAMS = \27sbin_PROGRAMS = \
26 upstart-socket-bridge \28 upstart-socket-bridge \
2729
=== added file 'extra/conf-session/upstart-dbus-session-bridge.conf'
--- extra/conf-session/upstart-dbus-session-bridge.conf 1970-01-01 00:00:00 +0000
+++ extra/conf-session/upstart-dbus-session-bridge.conf 2013-07-24 04:43:28 +0000
@@ -0,0 +1,16 @@
1# upstart-dbus-bridge - Bridge D-Bus signal events into upstart
2#
3# This helper daemon receives D-Bus signal events and
4# emits equivalent Upstart events.
5
6description "Bridge D-Bus session bus signal events into upstart"
7
8emits dbus
9
10start on started dbus
11stop on stopping dbus
12
13expect daemon
14respawn
15
16exec upstart-dbus-bridge --daemon --session --user --bus-name session
017
=== added file 'extra/conf-session/upstart-dbus-system-bridge.conf'
--- extra/conf-session/upstart-dbus-system-bridge.conf 1970-01-01 00:00:00 +0000
+++ extra/conf-session/upstart-dbus-system-bridge.conf 2013-07-24 04:43:28 +0000
@@ -0,0 +1,16 @@
1# upstart-dbus-bridge - Bridge D-Bus signal events into upstart
2#
3# This helper daemon receives D-Bus signal events and
4# emits equivalent Upstart events.
5
6description "Bridge D-Bus system bus signal events into upstart"
7
8emits dbus
9
10start on started dbus
11stop on stopping dbus
12
13expect daemon
14respawn
15
16exec upstart-dbus-bridge --daemon --system --user --bus-name system

Subscribers

People subscribed via source and target branches