Merge lp:~xnox/upstart/systemd-local-bridge into lp:ubuntu/vivid/upstart

[Dimitri John Ledkov]

[lp:~xnox/upstart/systemd-local-bridge]

1599. By Dimitri John Ledkov on 2015-01-16

* debian/upstart-bin.upstart.cron.daily: Emit "rotate-logs" event direct
  into session init, by-passing system upstart & session
* extra/upstart-local-bridge: implement systemd pid1 logic.
* extra/upstart-event-bridge: make it re-emit upstart-local-bridge
  events direct.
* util/telinit: Revert to synchronous behaviour coupled with unavoidable
  poll to ensure telinit only returns once a re-exec has completed (LP:
  #901038).

1600. By Dimitri John Ledkov on 2015-01-17

Add control xml bindings.

1601. By Dimitri John Ledkov on 2015-01-17

Drop event-bridge

1602. By Dimitri John Ledkov on 2015-01-17

move udev & local bridges to upstart-bin package.

1603. By Dimitri John Ledkov on 2015-01-17

Drop local option, use systemd_booted detection instead.

1604. By Dimitri John Ledkov on 2015-01-17

releasing package upstart version 1.13.2-0ubuntu6

1605. By Dimitri John Ledkov on 2015-01-17

Correct upstart-udev-bridge session job start/stop on conditions.

[Dimitri John Ledkov (xnox)]

This merge proposal is in SILO 01

=== modified file 'ChangeLog'
--- ChangeLog	2014-09-04 11:29:54 +0000
+++ ChangeLog	2015-01-17 15:39:44 +0000
@@ -1,3 +1,15 @@
[phone]  James Hunt  <[e-mail]>
+
+	* util/telinit.c: Remove UPSTART_TELINIT_U_NO_WAIT check as it
+	  shouldn't realistically be needed.
+
[phone]  James Hunt  <[e-mail]>
+
+	* util/telinit.c: restart_upstart():
+	  - Revert to synchronous behaviour coupled with unavoidable
+	    poll to ensure telinit only returns once a re-exec has
+	    completed (LP: #901038).
+
 2014-09-04  James Hunt  <[e-mail]>
 
 	* NEWS: Release 1.13.2
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-01-16 19:15:46 +0000
+++ debian/changelog	2015-01-17 15:39:44 +0000
@@ -1,13 +1,33 @@
+<<<<<<< TREE
 upstart (1.13.2-0ubuntu6) UNRELEASED; urgency=medium
 
   * debian/upstart-bin.upstart.cron.daily: Emit "rotate-logs" event direct
     into session init, by-passing system upstart & session
+=======
+upstart (1.13.2-0ubuntu7) UNRELEASED; urgency=medium
+
+  * Correct upstart-udev-bridge session job start/stop on conditions.
+
+ -- Dimitri John Ledkov <[e-mail]>  Sat, 17 Jan 2015 15:38:35 +0000
+
+upstart (1.13.2-0ubuntu6) vivid; urgency=medium
+
+  * debian/upstart-bin.upstart.cron.daily: Emit "rotate-logs" event direct
+    into session init, by-passing system upstart & session
+>>>>>>> MERGE-SOURCE
     event-bridge. This way session logs will be rotated, even upstart is
     not system init.
   * debian/control: make upstart-monitor & upstart-dconf-bridge be
     installable with just session init, upstart-bin.
+  * extra/upstart-local-bridge: implement systemd pid1 logic.
+  * extra/upstart-event-bridge: make it re-emit upstart-local-bridge
+    events direct.
+  * util/telinit: Revert to synchronous behaviour coupled with unavoidable
+    poll to ensure telinit only returns once a re-exec has completed (LP:
+    #901038).
+  * move udev & local bridges to upstart-bin package.
 
- -- Dimitri John Ledkov <[e-mail]>  Sun, 11 Jan 2015 01:15:34 +0000
+ -- Dimitri John Ledkov <[e-mail]>  Sat, 17 Jan 2015 01:59:42 +0000
 
 upstart (1.13.2-0ubuntu5) vivid; urgency=medium
 
 
=== modified file 'debian/control'
--- debian/control	2015-01-11 01:19:24 +0000
+++ debian/control	2015-01-17 15:39:44 +0000
@@ -33,8 +33,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
 Suggests: python3, graphviz, bash-completion, upstart-monitor
-Replaces: upstart (<< 1.13.2-0ubuntu3)
-Breaks: upstart (<< 1.13.2-0ubuntu3)
+Replaces: upstart (<< 1.13.2-0ubuntu6)
+Breaks: upstart (<< 1.13.2-0ubuntu6)
 Multi-Arch: foreign
 Description: event-based init daemon - essential binaries
  upstart is a replacement for the /sbin/init daemon which handles
 
=== modified file 'debian/rules'
--- debian/rules	2014-11-19 11:52:17 +0000
+++ debian/rules	2015-01-17 15:39:44 +0000
@@ -52,7 +52,6 @@
 	install -m 644 debian/upstart-bin.apport \
 		debian/upstart-bin/usr/share/apport/package-hooks/source_upstart.py
 	rm debian/upstart-bin/usr/share/upstart/sessions/upstart-dconf-bridge.conf
-	rm debian/upstart/etc/init/upstart-event-bridge.conf
 	rm debian/upstart/etc/init/upstart-dbus-bridge.conf
 
 override_dh_installcron:
 
=== modified file 'debian/upstart-bin.install'
--- debian/upstart-bin.install	2014-11-19 11:52:17 +0000
+++ debian/upstart-bin.install	2015-01-17 15:39:44 +0000
@@ -11,6 +11,8 @@
 sbin/upstart-dbus-bridge
 sbin/upstart-event-bridge
 sbin/upstart-file-bridge
+sbin/upstart-local-bridge
+sbin/upstart-udev-bridge
 debian/running-in-container bin/
 debian/apparmor-profile-load lib/init/
 usr/share/upstart/sessions/*
@@ -31,6 +33,8 @@
 usr/share/man/man8/upstart.8
 usr/share/man/man8/upstart-file-bridge.8
 usr/share/man/man8/upstart-dbus-bridge.8
+usr/share/man/man8/upstart-local-bridge.8
+usr/share/man/man8/upstart-udev-bridge.8
 usr/share/man/man8/initctl2dot.8
 usr/share/man/man8/initctl.8
 usr/share/man/man5/upstart.5
 
=== modified file 'debian/upstart.install'
--- debian/upstart.install	2014-11-19 11:52:17 +0000
+++ debian/upstart.install	2015-01-17 15:39:44 +0000
@@ -6,9 +6,7 @@
 sbin/reboot
 sbin/runlevel
 sbin/shutdown
-sbin/upstart-local-bridge
 sbin/upstart-socket-bridge
-sbin/upstart-udev-bridge
 debian/upstart-job lib/init/
 debian/migrate-inittab.pl usr/lib/upstart/
 usr/share/man/man7/control-alt-delete.7
@@ -17,8 +15,6 @@
 usr/share/man/man7/socket-event.7
 usr/share/man/man7/power-status-changed.7
 usr/share/man/man8/shutdown.8
-usr/share/man/man8/upstart-local-bridge.8
-usr/share/man/man8/upstart-udev-bridge.8
 usr/share/man/man8/runlevel.8
 usr/share/man/man8/reboot.8
 usr/share/man/man8/upstart-socket-bridge.8
 
=== modified file 'extra/Makefile.am'
--- extra/Makefile.am	2013-11-14 17:41:01 +0000
+++ extra/Makefile.am	2015-01-17 15:39:44 +0000
@@ -23,6 +23,7 @@
 	conf-session/upstart-event-bridge.conf \
 	conf-session/upstart-file-bridge.conf \
 	conf-session/re-exec.conf \
+	conf-session/upstart-udev-bridge.conf \
 	conf-session/upstart-dbus-session-bridge.conf \
 	conf-session/upstart-dbus-system-bridge.conf
 
@@ -33,7 +34,6 @@
 
 dist_init_DATA = \
 	conf/upstart-socket-bridge.conf \
-	conf/upstart-event-bridge.conf \
 	conf/upstart-file-bridge.conf \
 	conf/upstart-dbus-bridge.conf
 
@@ -106,8 +106,9 @@
 upstart_local_bridge_SOURCES = \
 	upstart-local-bridge.c
 nodist_upstart_local_bridge_SOURCES = \
+	$(org_freedesktop_systemd1_OUTPUTS) \
 	$(com_ubuntu_Upstart_OUTPUTS) \
-	$(com_ubuntu_Upstart_Job_OUTPUTS)
+	$(control_com_ubuntu_Upstart_OUTPUTS)
 upstart_local_bridge_LDADD = \
 	$(LTLIBINTL) \
 	$(NIH_LIBS) \
@@ -224,15 +225,50 @@
 		--output=$@ $<
 
 
+org_freedesktop_systemd1_OUTPUTS = \
+	org.freedesktop.systemd1.c \
+	org.freedesktop.systemd1.h
+
+org_freedesktop_systemd1_XML = \
+	org.freedesktop.systemd1.xml
+
+$(org_freedesktop_systemd1_OUTPUTS): $(org_freedesktop_systemd1_XML)
+	$(AM_V_GEN)$(NIH_DBUS_TOOL) \
+		--package=$(PACKAGE) \
+		--mode=proxy --prefix=systemd \
+		--default-interface=org.freedesktop.systemd1.Manager \
+		--output=$@ $<
+
+# Server for upstart-local-bridge
+control_com_ubuntu_Upstart_OUTPUTS = \
+	control_com.ubuntu.Upstart.c \
+	control_com.ubuntu.Upstart.h
+
+control_com_ubuntu_Upstart_XML = \
+	com.ubuntu.Upstart.xml
+
+$(control_com_ubuntu_Upstart_OUTPUTS): $(control_com_ubuntu_Upstart_XML)
+	$(AM_V_GEN)$(NIH_DBUS_TOOL) \
+		--package=$(PACKAGE) \
+		--mode=object --prefix=control \
+		--default-interface=com.ubuntu.Upstart0_6 \
+		--output=$@ $<
+
+
+
 # These have to be built sources because we can't compile object files
 # without the header file existing first
 BUILT_SOURCES = \
 	$(com_ubuntu_Upstart_OUTPUTS) \
-	$(com_ubuntu_Upstart_Job_OUTPUTS)
+	$(control_com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Upstart_Job_OUTPUTS) \
+	$(org_freedesktop_systemd1_OUTPUTS)
 
 CLEANFILES = \
 	$(com_ubuntu_Upstart_OUTPUTS) \
-	$(com_ubuntu_Upstart_Job_OUTPUTS)
+	$(control_com_ubuntu_Upstart_OUTPUTS) \
+	$(com_ubuntu_Upstart_Job_OUTPUTS) \
+	$(org_freedesktop_systemd1_OUTPUTS)
 
 
 clean-local:
 
=== added file 'extra/com.ubuntu.Upstart.xml'
--- extra/com.ubuntu.Upstart.xml	1970-01-01 00:00:00 +0000
+++ extra/com.ubuntu.Upstart.xml	2015-01-17 15:39:44 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- upstart
+
+     com.ubuntu.Upstart.xml - interface definition for manager object
+
+     Copyright © 2009 Canonical Ltd.
+     Author: Scott James Remnant <[e-mail]>.
+
+     This file is free software; Canonical Ltd gives unlimited permission
+     to copy and/or distribute it, with or without modifications, as long
+     as this notice is preserved.
+
+     Communication and interaction with Upstart through this interface is
+     permitted without restriction.
+  -->
+
+<!DOCTYPE node PUBLIC
+  "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<node name="/com/ubuntu/Upstart">
+  <interface name="com.ubuntu.Upstart0_6">
+    <!-- Signal for events being emitted -->
+    <signal name="EventEmitted">
+      <arg name="name" type="s" />
+      <arg name="env" type="as" />
+    </signal>
+  </interface>
+</node>
 
=== added file 'extra/conf-session/upstart-udev-bridge.conf'
--- extra/conf-session/upstart-udev-bridge.conf	1970-01-01 00:00:00 +0000
+++ extra/conf-session/upstart-udev-bridge.conf	2015-01-17 15:39:44 +0000
@@ -0,0 +1,22 @@
+# upstart-udev-bridge - Bridge udev events into session upstart
+#
+# This helper daemon receives udev events from the netlink socket and
+# emits equivalent Upstart events.
+
+description	"Bridge udev events into upstart"
+
+# From upstart-udev-bridge itself
+emits *-device-added
+emits *-device-removed
+emits *-device-changed
+# From http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev-device.html
+emits *-device-online
+emits *-device-offline
+
+start on startup
+stop on desktop-end
+
+expect daemon
+respawn
+
+exec upstart-udev-bridge --daemon --user
 
=== removed file 'extra/conf/upstart-event-bridge.conf'
--- extra/conf/upstart-event-bridge.conf	2013-01-22 20:08:29 +0000
+++ extra/conf/upstart-event-bridge.conf	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# 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/org.freedesktop.systemd1.xml'
--- extra/org.freedesktop.systemd1.xml	1970-01-01 00:00:00 +0000
+++ extra/org.freedesktop.systemd1.xml	2015-01-17 15:39:44 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+     org.freedesktop.systemd1- interface definition for systemd manager object
+
+     Public Domain
+
+     Generated file using gdbus introspect call against systemd1 instance
+  -->
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.freedesktop.systemd1.Manager">
+  <method name="StartUnit">
+   <arg name="name" type="s" direction="in"/>
+   <arg name="mode" type="s" direction="in"/>
+   <arg name="job" type="o" direction="out"/>
+  </method>
+ </interface>
+</node>
 
=== modified file 'extra/upstart-event-bridge.c'
--- extra/upstart-event-bridge.c	2013-07-05 08:44:00 +0000
+++ extra/upstart-event-bridge.c	2015-01-17 15:39:44 +0000
@@ -26,6 +26,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -42,8 +45,10 @@
 #include "dbus/upstart.h"
 #include "com.ubuntu.Upstart.h"
 
+#define DBUS_ADDRESS_LOCAL "unix:abstract=/com/ubuntu/upstart/local/bridge"
 
 /* Prototypes for static functions */
+static int  systemd_booted       (void);
 static void upstart_disconnected (DBusConnection *connection);
 static void upstart_forward_event    (void *data, NihDBusMessage *message,
 				  const char *path);
@@ -60,6 +65,14 @@
 static int daemonise = FALSE;
 
 /**
+ * local:
+ *
+ * Set to TRUE if we should connect to upstart-local-bridge instead of
+ * the system init.
+ **/
+static int local = FALSE;
+
+/**
  * system_upstart:
  *
  * Proxy to system Upstart daemon.
@@ -119,9 +132,14 @@
 		exit (1);
 	}
 
+	local = systemd_booted ();
+
 	/* Initialise the connection to system Upstart */
-	system_connection = NIH_SHOULD (nih_dbus_bus (DBUS_BUS_SYSTEM, upstart_disconnected));
-
+	if (local) {
+		system_connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_LOCAL, upstart_disconnected));
+	} else {
+		system_connection = NIH_SHOULD (nih_dbus_bus (DBUS_BUS_SYSTEM, upstart_disconnected));
+	}
 	if (! system_connection) {
 		NihError *err;
 
@@ -134,7 +152,7 @@
 	}
 
 	system_upstart = NIH_SHOULD (nih_dbus_proxy_new (NULL, system_connection,
-						  DBUS_SERVICE_UPSTART, DBUS_PATH_UPSTART,
+						  NULL, DBUS_PATH_UPSTART,
 						  NULL, NULL));
 	if (! system_upstart) {
 		NihError *err;
@@ -259,6 +277,20 @@
 	return ret;
 }
 
+static int
+systemd_booted (void)
+{
+	struct stat st;
+
+	if (lstat ("/run/systemd/system/", &st) == 0) {
+		if (S_ISDIR(st.st_mode)) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 static void
 upstart_disconnected (DBusConnection *connection)
 {
@@ -293,7 +325,11 @@
 	nih_assert (event_name != NULL);
 
 	/* Build the new event name */
-	NIH_MUST (nih_strcat_sprintf (&new_event_name, NULL, ":sys:%s", event_name));
+	if (local) {
+		new_event_name = NIH_MUST (nih_strdup (NULL, event_name));
+	} else {
+		new_event_name = NIH_MUST (nih_sprintf (NULL, ":sys:%s", event_name));
+	}
 
 	/* Re-transmit the event */
 	pending_call = upstart_emit_event (user_upstart,
 
=== modified file 'extra/upstart-local-bridge.c'
--- extra/upstart-local-bridge.c	2013-11-14 17:41:01 +0000
+++ extra/upstart-local-bridge.c	2015-01-17 15:39:44 +0000
@@ -22,10 +22,14 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
@@ -45,24 +49,17 @@
 
 #include <nih-dbus/dbus_connection.h>
 #include <nih-dbus/dbus_proxy.h>
+#include <nih-dbus/dbus_object.h>
 
 #include "dbus/upstart.h"
 #include "com.ubuntu.Upstart.h"
-#include "com.ubuntu.Upstart.Job.h"
+#include "org.freedesktop.systemd1.h"
+#include "control_com.ubuntu.Upstart.h"
 
-/**
- * Job:
- *
- * @entry: list header,
- * @path: D-Bus path for a job.
- *
- * Representation of an Upstart Job.
- *
- **/
-typedef struct job {
-	NihList entry;
-	char *path;
-} Job;
+#define DBUS_ADDRESS_SYSTEMD "unix:path=/run/systemd/private"
+#define DBUS_PATH_SYSTEMD "/org/freedesktop/systemd1"
+#define DBUS_SERVICE_SYSTEMD "org.freedesktop.systemd1"
+#define DBUS_ADDRESS_LOCAL "unix:abstract=/com/ubuntu/upstart/local/bridge"
 
 /**
  * Socket:
@@ -100,12 +97,14 @@
 	struct ucred   ucred;
 } ClientConnection;
 
-static void upstart_job_added    (void *data, NihDBusMessage *message,
-				  const char *job);
-static void upstart_job_removed  (void *data, NihDBusMessage *message,
-				  const char *job);
 static void upstart_connect      (void);
-static void upstart_disconnected (DBusConnection *connection);
+static void systemd_connect      (void);
+static int  systemd_booted       (void);
+static int  control_server_open  (void);
+static int  control_server_connect (DBusServer *server,
+				    DBusConnection *conn);
+static void control_disconnected   (DBusConnection *conn);
+static void init_disconnected (DBusConnection *connection);
 
 static Socket *create_socket (void *parent);
 
@@ -121,6 +120,8 @@
 
 static void emit_event (ClientConnection *client, const char *pair, size_t len);
 
+static void process_event (ClientConnection *client, const char *pair, size_t len);
+
 static void signal_handler (void *data, NihSignal *signal);
 
 static void cleanup (void);
@@ -134,13 +135,6 @@
 static int daemonise = FALSE;
 
 /**
- * jobs:
- *
- * Jobs that we're monitoring.
- **/
-static NihHash *jobs = NULL;
-
-/**
  * upstart:
  *
  * Proxy to Upstart daemon.
@@ -148,9 +142,32 @@
 static NihDBusProxy *upstart = NULL;
 
 /**
+ * systemd:
+ *
+ * Proxy to systemd daemon.
+ **/
+static NihDBusProxy *systemd = NULL;
+
+/**
+ * control_server
+ * 
+ * D-Bus server listening for new direct connections.
+ **/
+DBusServer *control_server = NULL;
+
+/**
+ * control_conns:
+ *
+ * Open control connections, including the connection to a D-Bus
+ * bus and any private client connections.
+ **/
+NihList *control_conns = NULL;
+
+/**
  * event_name:
  *
- * Name of event this bridge emits.
+ * upstart: Name of event this bridge emits.
+ * systmed: Name of target this generator creates.
  **/
 static char *event_name = NULL;
 
@@ -202,7 +219,7 @@
 	{ 0, "daemon", N_("Detach and run in the background"),
 	  NULL, NULL, &daemonise, NULL },
 
-	{ 0, "event", N_("specify name of event to emit on receipt of name=value pair"),
+	{ 0, "event", N_("specify name of event to emit / target to generate on receipt of name=value pair"),
 		NULL, "EVENT", &event_name, NULL },
 
 	{ 0, "any-user", N_("allow any user to connect"),
@@ -258,7 +275,7 @@
 
 	nih_main_init (argv[0]);
 
-	nih_option_set_synopsis (_("Local socket Upstart Bridge"));
+	nih_option_set_synopsis (_("Local socket Upstart Bridge & systemd generator"));
 	nih_option_set_help (
 		_("By default, this bridge does not detach from the "
 		  "console and remains in the foreground.  Use the --daemon "
@@ -273,9 +290,6 @@
 		exit (1);
 	}
 
-	/* Allocate jobs hash table */
-	jobs = NIH_MUST (nih_hash_string_new (NULL, 0));
-
 	sock = create_socket (NULL);
 	if (! sock) {
 		nih_fatal ("%s %s",
@@ -286,7 +300,26 @@
 
 	nih_debug ("Connected to socket '%s' on fd %d", socket_name, sock->sock);
 
-	upstart_connect ();
+	if (systemd_booted() == TRUE) {
+		systemd_connect ();
+	} else {
+		upstart_connect ();
+	}
+
+	control_conns = NIH_MUST (nih_list_new (NULL));
+
+        while ((ret = control_server_open ()) < 0) {
+		NihError *err;
+
+                err = nih_error_get ();
+                if (err->number != ENOMEM) {
+                        nih_warn ("%s: %s", _("Unable to listen for private"
+					      "connections"), err->message);
+                        nih_free (err);
+			break;
+                }
+                nih_free (err);
+        }
 
 	/* Become daemon */
 	if (daemonise) {
@@ -326,103 +359,14 @@
 	return ret;
 }
 
-static void
-upstart_job_added (void            *data,
-		   NihDBusMessage  *message,
-		   const char      *job_class_path)
-{
-	nih_local NihDBusProxy *job_class = NULL;
-	nih_local char ***start_on = NULL;
-	nih_local char ***stop_on = NULL;
-	Job *job;
-
-	nih_assert (job_class_path != NULL);
-
-	/* Obtain a proxy to the job */
-	job_class = nih_dbus_proxy_new (NULL, upstart->connection,
-					upstart->name, job_class_path,
-					NULL, NULL);
-	if (! job_class) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_error ("Could not create proxy for job %s: %s",
-			   job_class_path, err->message);
-		nih_free (err);
-
-		return;
-	}
-
-	job_class->auto_start = FALSE;
-
-	/* Obtain the start_on and stop_on properties of the job */
-	if (job_class_get_start_on_sync (NULL, job_class, &start_on) < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_error ("Could not obtain job start condition %s: %s",
-			   job_class_path, err->message);
-		nih_free (err);
-
-		return;
-	}
-
-	if (job_class_get_stop_on_sync (NULL, job_class, &stop_on) < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_error ("Could not obtain job stop condition %s: %s",
-			   job_class_path, err->message);
-		nih_free (err);
-
-		return;
-	}
-
-	/* Free any existing record for the job (should never happen,
-	 * but worth being safe).
-	 */
-	job = (Job *)nih_hash_lookup (jobs, job_class_path);
-	if (job)
-		nih_free (job);
-
-	/* Create new record for the job */
-	job = NIH_MUST (nih_new (NULL, Job));
-	job->path = NIH_MUST (nih_strdup (job, job_class_path));
-
-	nih_list_init (&job->entry);
-
-	nih_debug ("Job got added %s", job_class_path);
-
-	nih_alloc_set_destructor (job, nih_list_destroy);
-
-	/* Add all jobs */
-	nih_hash_add (jobs, &job->entry);
-}
-
-static void
-upstart_job_removed (void            *data,
-		     NihDBusMessage  *message,
-		     const char      *job_path)
-{
-	Job *job;
-
-	nih_assert (job_path != NULL);
-
-	job = (Job *)nih_hash_lookup (jobs, job_path);
-	if (job) {
-		nih_debug ("Job went away %s", job_path);
-		nih_free (job);
-	}
-}
 
 static void
 upstart_connect (void)
 {
 	DBusConnection    *connection;
-	char            **job_class_paths;
 
 	/* Initialise the connection to Upstart */
-	connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected));
+	connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, init_disconnected));
 	if (! connection) {
 		NihError *err;
 
@@ -449,59 +393,169 @@
 	}
 
 	nih_debug ("Connected to Upstart");
-
-	/* Connect signals to be notified when jobs come and go */
-	if (! nih_dbus_proxy_connect (upstart, &upstart_com_ubuntu_Upstart0_6, "JobAdded",
-				      (NihDBusSignalHandler)upstart_job_added, NULL)) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_fatal ("%s: %s", _("Could not create JobAdded signal connection"),
-			   err->message);
-		nih_free (err);
-
-		exit (1);
-	}
-
-	if (! nih_dbus_proxy_connect (upstart, &upstart_com_ubuntu_Upstart0_6, "JobRemoved",
-				      (NihDBusSignalHandler)upstart_job_removed, NULL)) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_fatal ("%s: %s", _("Could not create JobRemoved signal connection"),
-			   err->message);
-		nih_free (err);
-
-		exit (1);
-	}
-
-	/* Request a list of all current jobs */
-	if (upstart_get_all_jobs_sync (NULL, upstart, &job_class_paths) < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_fatal ("%s: %s", _("Could not obtain job list"),
-			   err->message);
-		nih_free (err);
-
-		exit (1);
-	}
-
-	for (char **job_class_path = job_class_paths;
-	     job_class_path && *job_class_path; job_class_path++)
-		upstart_job_added (NULL, NULL, *job_class_path);
-
-	nih_free (job_class_paths);
-}
-
-static void
-upstart_disconnected (DBusConnection *connection)
-{
-	nih_fatal (_("Disconnected from Upstart"));
+}
+
+static void
+systemd_connect (void)
+{
+	DBusConnection    *connection;
+
+	/* Initialise the connection to systemd */
+	/* /run/systemd/private is supposedly "private" end-point
+	 * which systemctl & libsystemd use */
+	connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_SYSTEMD, init_disconnected));
+	if (! connection) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not connect to systemd"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	systemd = NIH_SHOULD (nih_dbus_proxy_new (NULL, connection,
+						  NULL, DBUS_PATH_SYSTEMD,
+						  NULL, NULL));
+	if (! systemd) {
+		NihError *err;
+
+		err = nih_error_get ();
+		nih_fatal ("%s: %s", _("Could not create systemd proxy"),
+			   err->message);
+		nih_free (err);
+
+		exit (1);
+	}
+
+	FILE *fp = NULL;
+	nih_local char *template_name = NULL;
+	
+	template_name = NIH_MUST (nih_sprintf (NULL, "/run/systemd/system/%s@.target", event_name));
+
+	fp = NIH_SHOULD (fopen(template_name, "we"));
+	if (!fp) {
+		nih_fatal ("%s %s", _("Failed to create target template"),
+			  strerror (errno));
+		exit (1);
+	}
+	fprintf (fp,
+		"# Automatically generated by %s\n\n"
+		"[Unit]\n"
+		"Description=Local bridge key value pairs\n"
+		"Documentation=man:%s\n",
+		program_name, program_name);
+	fflush (fp);
+	if (ferror (fp)) {
+		nih_fatal ("%s %s", _("Failed to write target template"),
+			   strerror (errno));
+		exit (1);
+	}
+	fclose (fp);
+
+	nih_debug ("Connected to systemd");
+}
+
+static int
+systemd_booted (void)
+{
+	struct stat st;
+
+	if (lstat ("/run/systemd/system/", &st) == 0) {
+		if (S_ISDIR(st.st_mode)) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+static void
+init_disconnected (DBusConnection *connection)
+{
+	nih_fatal (_("Disconnected from init"));
 	nih_main_loop_exit (1);
 }
 
 /**
+ * control_server_open:
+ *
+ * Open a listening D-Bus server and store it in the control_server global.
+ * New connections are permitted from the root user, and handled
+ * automatically in the main loop.
+ *
+ * Returns: zero on success, negative value on raised error.
+ **/
+
+int
+control_server_open (void)
+{
+	nih_assert (control_server == NULL);
+
+	control_server = nih_dbus_server (DBUS_ADDRESS_LOCAL,
+				  control_server_connect,
+				  control_disconnected);
+	if (! control_server)
+		return -1;
+
+	nih_debug("D-Bus server started at address: %s", DBUS_ADDRESS_LOCAL);
+
+	return 0;
+}
+
+/**
+ * control_server_connect:
+ *
+ * Called when a new client connects to our server and is used to register
+ * objects on the new connection.
+ *
+ * Returns: always TRUE.
+ **/
+static int
+control_server_connect (DBusServer     *server,
+			DBusConnection *conn)
+{
+	nih_assert (server != NULL);
+	nih_assert (server == control_server);
+	nih_assert (conn != NULL);
+	NihListEntry *entry = NULL;
+
+	/* Register objects on the connection. */
+	NIH_MUST (nih_dbus_object_new (NULL, conn, DBUS_PATH_UPSTART,
+				       control_interfaces, NULL));
+
+
+	entry = NIH_MUST (nih_list_entry_new (NULL));
+	entry->data = conn;
+	nih_list_add (control_conns, &entry->entry);
+	nih_debug("Connection from private client");
+
+	return TRUE;
+}
+
+/**
+ * control_disconnected:
+ *
+ * This function is called when the connection to the D-Bus system bus,
+ * or a client connection to our D-Bus server, is dropped and our reference
+ * is about to be list.  We clear the connection from our current list
+ * and drop the control_bus global if relevant.
+ **/
+static void
+control_disconnected (DBusConnection *conn)
+{
+	nih_assert (conn != NULL);
+        /* Remove from the connections list */
+        NIH_LIST_FOREACH_SAFE (control_conns, iter) {
+                NihListEntry *entry = (NihListEntry *)iter;
+
+                if (entry->data == conn)
+                        nih_free (entry);
+        }
+}
+
+/**
  * socket_watcher:
  *
  * @sock: Socket,
@@ -645,7 +699,7 @@
 		if (used_len < min_len)
 			continue;
 
-		emit_event (client, pair, used_len);
+		process_event (client, pair, used_len);
 	}
 
 	/* Consume the entire length */
@@ -724,6 +778,8 @@
 	/* Handle abstract names */
 	if (sock->sun_addr.sun_path[0] == '@')
 		sock->sun_addr.sun_path[0] = '\0';
+	else
+		(void) unlink(sock->sun_addr.sun_path);
 
 	sock->sock = socket (sock->addr.sa_family, SOCK_STREAM, 0);
 	if (sock->sock < 0) {
@@ -830,17 +886,102 @@
 	/* Add the name=value pair */
 	NIH_MUST (nih_str_array_addn (&env, NULL, NULL, pair, len));
 
-	pending_call = upstart_emit_event (upstart,
-			event_name, env, FALSE,
-			NULL, emit_event_error, NULL,
-			NIH_DBUS_TIMEOUT_NEVER);
-
-	if (! pending_call) {
+	if (upstart) {
+		pending_call = upstart_emit_event (upstart,
+						   event_name, env, FALSE,
+						   NULL, emit_event_error, NULL,
+						   NIH_DBUS_TIMEOUT_NEVER);
+		
+		if (! pending_call) {
+			NihError *err;
+			err = nih_error_get ();
+			nih_warn ("%s", err->message);
+			nih_free (err);
+		}
+		
+		dbus_pending_call_unref (pending_call);
+	}
+
+	NIH_LIST_FOREACH (control_conns, iter) {
+		NihListEntry   *entry = (NihListEntry *)iter;
+		DBusConnection *conn = (DBusConnection *)entry->data;
+
+		NIH_ZERO (control_emit_event_emitted (conn, DBUS_PATH_UPSTART,
+							    event_name, env));
+	}
+
+}
+
+static void
+systemd_launch_instance (ClientConnection  *client,
+	    const char        *pair,
+	    size_t             len)
+{
+	nih_local char     *safe_pair = NULL;
+	nih_local char    **key_value = NULL;
+	nih_local char     *group_name = NULL;
+	nih_local char     *unit_name = NULL;
+	nih_local char     *job_name = NULL;
+
+	nih_assert  (client);
+	nih_assert  (pair);
+	nih_assert  (len);
+
+	/* Why is pair not null-terminated?! */
+	safe_pair = NIH_MUST (nih_strndup (NULL, pair, len));
+
+	/* Get key val from the key=val pair */
+	key_value = NIH_MUST (nih_str_split (NULL, safe_pair, "=", TRUE));
+
+	/* Construct systemd event@key=*.target group name */
+	group_name = NIH_MUST (nih_sprintf (NULL, "%s@%s=*.target",
+					    event_name, key_value[0]));
+
+	/* Construct systemd event@key=value.target unit name */
+	unit_name = NIH_MUST (nih_sprintf (NULL, "%s@%s\\x3d%s.target",
+					   event_name, key_value[0],
+					   key_value[1]));
+
+	/* Stop group */
+	int pid = -1;
+	siginfo_t info;
+	do {
+		pid = fork ();
+	} while (pid < 0);
+	
+	if (pid) {
+		info.si_code = 0;
+		info.si_status = 0;
+		if (waitid (P_PID, pid, &info, WEXITED)) {
+			nih_fatal ("%s %s", _("Failed to wait for systemctl"),
+				   strerror (errno));
+		}
+                if (info.si_code != CLD_EXITED || info.si_status) {
+                        nih_fatal ("Bad systemctl exit code %i and status %i\n", info.si_code, info.si_status);
+                }
+	} else {
+		/* Create and submit stop state transition, do not wait to complete */
+		execlp ("systemctl", "systemctl", "--no-block", "stop", group_name, (char *)NULL);
+	}
+			       
+	/* Create and submit start state transition, do not wait to complete */
+	if (systemd_start_unit_sync (NULL, systemd, unit_name, "replace", &job_name)) {
 		NihError *err;
 		err = nih_error_get ();
 		nih_warn ("%s", err->message);
 		nih_free (err);
 	}
-
-	dbus_pending_call_unref (pending_call);
+}
+
+
+static void
+process_event (ClientConnection  *client,
+	    const char        *pair,
+	    size_t             len)
+{
+	emit_event (client, pair, len);
+
+	if (systemd) {
+		systemd_launch_instance (client, pair, len);
+	}
 }
 
=== modified file 'extra/upstart-udev-bridge.c'
--- extra/upstart-udev-bridge.c	2013-10-18 15:02:34 +0000
+++ extra/upstart-udev-bridge.c	2015-01-17 15:39:44 +0000
@@ -69,6 +69,15 @@
 static NihDBusProxy *upstart = NULL;
 
 /**
+ * user:
+ *
+ * If TRUE, run in User Session mode connecting to the Session Init
+ * rather than PID 1. In this mode, certain relative paths are also
+ * expanded.
+ **/
+static int user = FALSE;
+
+/**
  * no_strip_udev_data:
  *
  * If TRUE, do not modify any udev message data (old behaviour).
@@ -86,6 +95,8 @@
 	  NULL, NULL, &daemonise, NULL },
 	{ 0, "no-strip", N_("Do not strip non-printable bytes from udev message data"),
 	  NULL, NULL, &no_strip_udev_data, NULL },
+	{ 0, "user", N_("Connect to user session"),
+	  NULL, NULL, &user, NULL },
 
 	NIH_OPTION_LAST
 };
@@ -97,6 +108,11 @@
 {
 	char **              args;
 	DBusConnection *     connection;
+	char *               pidfile_path = NULL;
+	char *               pidfile = NULL;
+	char                *user_session_addr = NULL;
+	nih_local char **    user_session_path = NULL;
+	char *               path_element = NULL;
 	struct udev *        udev;
 	struct udev_monitor *udev_monitor;
 	int                  ret;
@@ -113,8 +129,19 @@
 	if (! args)
 		exit (1);
 
+	if (user) {
+		user_session_addr = getenv ("UPSTART_SESSION");
+		if (! user_session_addr) {
+			nih_fatal (_("UPSTART_SESSION isn't set in environment"));
+			exit (EXIT_FAILURE);
+		}
+	}
+
 	/* Initialise the connection to Upstart */
-	connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected));
+	connection = NIH_SHOULD (nih_dbus_connect (user
+				? user_session_addr
+				: DBUS_ADDRESS_UPSTART,
+				upstart_disconnected));
 	if (! connection) {
 		NihError *err;
 
@@ -153,6 +180,35 @@
 
 	/* Become daemon */
 	if (daemonise) {
+		/* Deal with the pidfile location when becoming a daemon.
+		 * We need to be able to run one bridge per upstart daemon.
+		 * Store the PID file in XDG_RUNTIME_DIR or HOME and include the pid of
+		 * the Upstart instance (last part of the DBus path) in the filename.
+		 */
+
+		if (user) {
+			/* Extract PID from UPSTART_SESSION */
+			user_session_path = nih_str_split (NULL, user_session_addr, "/", TRUE);
+			
+			for (int i = 0; user_session_path && user_session_path[i]; i++)
+				path_element = user_session_path[i];
+
+			if (! path_element) {
+				nih_fatal (_("Invalid value for UPSTART_SESSION"));
+				exit (1);
+			}
+
+			pidfile_path = getenv ("XDG_RUNTIME_DIR");
+			if (!pidfile_path)
+				pidfile_path = getenv ("HOME");
+
+			if (pidfile_path) {
+				NIH_MUST (nih_strcat_sprintf (&pidfile, NULL, "%s/%s.%s.pid",
+							      pidfile_path, program_invocation_short_name, path_element));
+				nih_main_set_pidfile (pidfile);
+			}
+		}
+
 		if (nih_main_daemonise () < 0) {
 			NihError *err;
 
@@ -163,10 +219,12 @@
 
 			exit (1);
 		}
-
-		/* Send all logging output to syslog */
-		openlog (program_name, LOG_PID, LOG_DAEMON);
-		nih_log_set_logger (nih_logger_syslog);
+		
+		if (!user) {
+			/* Send all logging output to syslog for system bridge */
+			openlog (program_name, LOG_PID, LOG_DAEMON);
+			nih_log_set_logger (nih_logger_syslog);
+		}
 	}
 
 	/* Handle TERM and INT signals gracefully */
 
=== modified file 'util/telinit.c'
--- util/telinit.c	2014-03-10 13:43:50 +0000
+++ util/telinit.c	2015-01-17 15:39:44 +0000
@@ -160,27 +160,73 @@
 int
 restart_upstart (void)
 {
-	nih_local NihDBusProxy *upstart = NULL;
-	DBusPendingCall        *ret;
+	nih_local NihDBusProxy  *upstart = NULL;
+	NihError                *err;
+	int                      ret;
 
 	upstart = upstart_open (NULL);
 	if (! upstart)
 		return -1;
 
-	/* Fire and forget:
-	 *
-	 * Ask Upstart to restart itself using the async interface to
-	 * avoid the client-side complaining if and when it detects that
-	 * Upstart has severed all connections to perform the re-exec.
-	 */
-	ret = upstart_restart (upstart, NULL, NULL, NULL, 0);
-	dbus_connection_flush(upstart->connection);
-
-	/* We don't care about the return code, but we have to keep
-	 * the compiler happy.
-	 */
-	if (ret != (DBusPendingCall *)TRUE)
-		return 0;
+	/* Ask Upstart to restart itself.
+	 *
+	 * Since it is not possible to serialise a D-Bus connection,
+	 * Upstart is forced to sever all D-Bus client connections,
+	 * including this one.
+	 *
+	 * Further, since the user expects telinit to block _until the
+	 * re-exec has finished and Upstart is accepting connections
+	 * once again_, the only solution is to wait for the forced
+	 * disconnect, then poll until it is possible to create a new
+	 * connection.
+	 *
+	 * Note that we don't (can't) care about the return code since
+	 * it's not reliable:
+	 *
+	 * - either the re-exec request completed and D-Bus returned zero
+	 *   before Upstart started the re-exec.
+	 *
+	 * - or the re-exec request completed but upstart started the
+	 *   re-exec (severing all D-Bus connections) before D-Bus got a
+	 *   chance to finish cleanly meaning we receive a return of -1.
+	 *
+	 * We cannot know exactly what happened so have to allow for
+	 * both scenarios. Note the implicit assumption that the re-exec
+	 * request itself was accepted. If this assumption is incorrect
+	 * (should not be possible), the worst case scenario is that
+	 * upstart does not re-exec and then we quickly drop out of the
+	 * reconnect block since it never went offline.
+	 */
+	ret = upstart_restart_sync (NULL, upstart);
+
+	if (ret < 0) {
+		err = nih_error_get ();
+		nih_free (err);
+	}
+
+	nih_free (upstart);
+
+	nih_debug ("Waiting for upstart to finish re-exec");
+
+	/* We believe Upstart is now in the process of
+	 * re-exec'ing so attempt forever to reconnect.
+	 *
+	 * This sounds dangerous but there is no other option,
+	 * and a connection must be possible unless the system
+	 * is completely broken.
+	 */
+	while (TRUE) {
+
+		upstart = upstart_open (NULL);
+		if (upstart)
+			break;
+
+		err = nih_error_get ();
+		nih_free (err);
+
+		/* Avoid DoS'ing the system whilst we wait */
+		usleep (100000);
+	}
 
 	return 0;
 }