Merge lp:~jamesodhunt/upstart/add-sample-session-jobs into lp:upstart

[James Hunt]

* extra/conf-session/: Addition of example jobs for Session Inits.

[Dimitri John Ledkov (xnox)]

please merge this.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-07-17 14:21:18 +0000
+++ ChangeLog	2013-07-18 14:14:31 +0000
@@ -1,3 +1,7 @@
[phone]  James Hunt  <[e-mail]>
+
+	* extra/conf-session/: Addition of example jobs for Session Inits.
+
 2013-07-17  James Hunt  <[e-mail]>
 
 	* init/tests/test_state.c:
 
=== modified file 'extra/Makefile.am'
--- extra/Makefile.am	2013-07-05 10:03:36 +0000
+++ extra/Makefile.am	2013-07-18 14:14:31 +0000
@@ -15,6 +15,12 @@
 
 initdir = $(sysconfdir)/init
 
+sessionsdir = $(datadir)/upstart/sessions
+
+dist_sessions_DATA = \
+	conf-session/upstart-event-bridge.conf \
+	conf-session/upstart-file-bridge.conf \
+	conf-session/re-exec.conf
 
 sbin_PROGRAMS = \
 	upstart-socket-bridge \
 
=== added directory 'extra/conf-session'
=== added file 'extra/conf-session/re-exec.conf'
--- extra/conf-session/re-exec.conf	1970-01-01 00:00:00 +0000
+++ extra/conf-session/re-exec.conf	2013-07-18 14:14:31 +0000
@@ -0,0 +1,6 @@
+description "Restart session init when system init restarts"
+author "Stéphane Graber <[e-mail]>"
+
+start on :sys:restarted
+
+exec dbus-send --type=method_call --address=$UPSTART_SESSION /com/ubuntu/Upstart com.ubuntu.Upstart0_6.Restart
 
=== added file 'extra/conf-session/upstart-event-bridge.conf'
--- extra/conf-session/upstart-event-bridge.conf	1970-01-01 00:00:00 +0000
+++ extra/conf-session/upstart-event-bridge.conf	2013-07-18 14:14:31 +0000
@@ -0,0 +1,15 @@
+# upstart-event-bridge - Bridge system upstarts events into session upstart
+#
+# This helper daemon receives system upstart events from the DBus system bus
+# and emits equivalent events (with a :sys:) prefix to the session bus
+
+description	"Bridge Upstart system events into session Upstart"
+
+emits :sys:*
+
+start on started dbus
+stop on stopped dbus
+
+respawn
+
+exec upstart-event-bridge
 
=== added file 'extra/conf-session/upstart-file-bridge.conf'
--- extra/conf-session/upstart-file-bridge.conf	1970-01-01 00:00:00 +0000
+++ extra/conf-session/upstart-file-bridge.conf	2013-07-18 14:14:31 +0000
@@ -0,0 +1,16 @@
+# upstart-file-bridge - Bridge file events into upstart
+#
+# This helper daemon receives inotify(7) events and
+# emits equivalent Upstart events.
+
+description	"Bridge file events into upstart"
+
+emits file
+
+start on startup
+stop on session-end
+
+expect daemon
+respawn
+
+exec upstart-file-bridge --daemon --user