diff --git a/.gitignore b/.gitignore
index 5056c71..a69330a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1 @@
-upstart-0.6.6.tar.gz
-/initjobs-20101206.tar.gz
-/upstart-0.6.7.tar.gz
-/upstart-1.0.tar.gz
-/upstart-1.1.tar.gz
-/upstart-1.2.tar.gz
-/initjobs-20110502.tar.gz
+upstart-0.3.11.tar.bz2
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 7ceac32..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-This package was retired on 2012-08-06 due to no active maintainers for the package.
diff --git a/events.5 b/events.5
new file mode 100644
index 0000000..d6e30b9
--- /dev/null
+++ b/events.5
@@ -0,0 +1,286 @@
+.TH events 5 "April 2008" "Upstart"
+.\"
+.SH NAME
+events \- format of event files used by the upstart init system
+.\"
+.SH DESCRIPTION
+upstart works on the basis of \fBevent\fP files that describe jobs
+that should be managed. This includes the particulars about what binary
+or shell script code should executed while the job is running, and
+which events can cause the job to be started or stopped.
+
+Event files are stored in the \fI/etc/event.d\fP directory.
+.\"
+.SH SYNTAX
+
+Event files can contain the following stanzaz.
+
+.TP
+.BI "exec  <command> <arguments>"
+When the event is started by \fBinit\fR, execute the following arguments.
+
+Example: exec /bin/dbus-daemon --system
+
+.TP
+.BI "script ..."
+Like \fBexec\fR but instead of executing a single program, execute
+the following shell code. \fBscript\fR sections are closed with a
+\fBend script\fR marker.
+
+Example:
+.nf
+	script
+		rm -f /var/run/sshd.pid
+		sshd
+	end script
+.ni
+
+Only one of  \fBexec\fR and \fBscript\fR can be used at a time. If both
+are bspecifed, \fBexec\fR takes priority.
+
+.TP
+.BI pre-start
+Execute the command/script before actually starting the process.
+\fBpre-start\fR can be invoked as \fBpre-start exec\fR or \fBpre-start script\fR
+in the same way that a start action can be handled by either
+\fBexec\fR or \fBscript\fR.
+
+.TP
+.BI post-start
+Execute the command/script after starting the process.
+The format is similar to \fBpre-start\fR.
+
+.TP
+.BI pre-stop
+Execute the command/script before stopping the process.
+The format is similar to \fBpre-start\fR.
+
+.TP
+.BI post-stop
+Execute the command/script after stopping the process.
+The format is similar to \fBpre-start\fR.
+
+.TP
+.BI "start on <event>"
+Describes on what condition to start this job. Without this
+section, the job can only be manually started with the
+\fBinitctl(8)\fR command.
+
+Examples:
+.nf
+	start on startup
+	This starts immediately after boot.
+
+	start on stopped rc3
+	This starts when the 'rc3' event has stopped.
+.ni
+
+Events are matched via globbing. So a stanza of the form
+.nf
+	start on runlevel [2345]
+.ni
+would match any of runlevels 2, 3, 4, or 5.
+
+.TP
+.BI "stop on <event>"
+Describes on what condition to stop this job. Without this
+section, the job can only be manually stopped with the
+\fBinitctl\fR command.
+
+Examples:
+.nf
+	stop on runlevel 0
+	This stops the job when runlevel 0 is entered.
+
+	stop on stopping dbus ok
+	This stops the job when the 'dbus' job is stopped.
+.ni
+
+Events are matched via globbing. So a stanza of the form
+.nf
+	stop on runlevel [!5]
+.ni
+would match any runlevel other than 5.
+
+.TP
+.BI daemon
+Sets the daemon flag for the job. This means that the job will
+fork in the background and that its PID needs to be obtained.
+
+.TP
+.BI respawn
+This sets the daemon, service, and respawn flags for the job.
+The respawn flag means that the process will be restarted when
+it ends.
+
+.TP
+.BI "respawn limit [count [timeout]]"
+This configures respawn limits. Respawn limits only apply
+if the \fBrespawn\fR flag is set for the job; setting a limit
+does not automatically set respawning capability. If the
+process is respawned more than  \fIcount\fR times within an
+interval of \fItimeout\fR seconds, the job will be stopped
+automatically, andn ot restarted. The limit defaults to 10
+times within 5 seconds.
+
+Example: respawn limit 10 120
+
+This sets the limit for respawn to ten times within two
+minutes, the historical behavior for System V init.
+
+.TP
+.BI service
+\fBservice\fR means that the job has reached its goal when running.
+\fBservice\fR is implied by the \fBrespawn\fR flag.
+
+.TP
+.BI instance
+\fBinstance\fR means that the job starts new instances every time
+it is started, even if there is another instance running. It
+is the converse of \fBdaemon\fR.
+
+.TP
+.BI "kill timeout <time>"
+Sets the time to wait between sending TERM and KILL signals to
+\fItime\fR seconds.
+
+.TP
+.BI "normal exit <status>"
+When used with \fBrespawn\fR any exit codes denoted in \fIstatus\fR will
+prevent a respawn of the process.
+
+.TP
+.BI "console {logged|output|owner|none}"
+Describes what to do with the job's output. Valid values are:
+
+.I logged
+Redirect to logger. (the default setting)
+
+.I output
+Direct to the current stdout
+
+.I owner
+The process becomes the owner of the console, allowing it to
+receive signals from the keyboard
+
+.I none
+Output is redirected to /dev/null
+
+.TP
+.BI "env <name>=<value>"
+Sets an environment variable for the job.
+
+Example: env LD_LIBRARY_PATH=/opt/app/lib
+
+.TP
+.BI "umask <umask>"
+Sets the umask of the job to \fIumask\fR.
+
+Example: umask 0755
+
+.TP
+.BI "nice <value>"
+Sets the nice level of the job to \fIvalue\fR.
+
+Example: nice 5
+
+.TP
+.BI "chroot <path>"
+Changes the job's root directory to \fIpath\fR.
+
+Example: chroot /var/empty
+
+.TP
+.BI "chdir <path>"
+Changes the working directory of the job to \fIpath\fR.
+
+Example: chdir /var/tmp
+
+.TP
+.BI "limit {as|core|cpu|data|fsize|memlock|msgqueue|nice|nofile|nproc|rss|rtprio|sigpending|stack} {unlimited|<value>}"
+Changes the limit of the process to whatever is specfied.
+
+Examples:
+.nf
+	limit nproc 10
+	limit core unlimited
+.ni
+
+.TP
+.BI "description <text>"
+Describes the job. Not currently used by any \fBinit(8)\fR tools.
+
+Example: descripton "This is a test job."
+
+.TP
+.BI "author <text>"
+Author of the job. Not currently used by any \fBinit(8)\fR tools.
+Example: author "Obi-wan Kennedy <bidy@whitehouse.gov>"
+
+.TP
+.BI "version <version>"
+Version of the job. Not currently used by any \fBinit(8)\fR tools.
+Example: version "0.0.0.0.1 test"
+
+.TP
+.BI "emits <signals>"
+Describes signals emitted by the job. Not currently used by
+any \fBinit(8)\fR tools. For more information on signals, see the
+\fBinitctl(8)\fR man page and the \fBemit\fR option.
+
+Example: emits spam egg ham
+.\"
+.SH EVENTS
+A wide array of events can be emitted by the system (see
+\fBinitctl(8)\fR) but the following events are generated by
+upstart itself, or are usually seen on a typical install.
+
+.TP
+.BI "stalled"
+No jobs are running and no events are pending.
+
+.TP
+.BI "control-alt-delete"
+Control-Alt-Delete has been pressed.
+
+.TP
+.BI "kbdrequest"
+A kbdrequest event has occurred.
+
+.TP
+.BI "power-status-changed"
+Init received SIGPWR.
+
+.TP
+.BI "starting <job>"
+The given job is being started.
+
+.TP
+.BI "started <job>"
+The given job has successfully been started.
+
+.TP
+.BI "stopping <job>"
+The given job is being stopped.
+
+.TP
+.BI "stopped <job>"
+The given job has been stopped successfully.
+
+.TP
+.BI "startup"
+Emitted when the system boots.
+
+.TP
+.BI "runlevel <runlevel>"
+Init has been asked to move to the given runlevel.
+.\"
+.SH FILES
+.I /etc/event.d
+The directory where event files are stored.
+.\"
+.SH SEE ALSO
+.BR initctl (8)
+.BR telinit (8)
+.BR init (8)
+.BR http://upstart.ubuntu.com/getting-started.html
diff --git a/sources b/sources
new file mode 100644
index 0000000..736f5d8
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+a9e475e1458c876add0441d9d4cfe9c0  upstart-0.3.11.tar.bz2
diff --git a/upstart-audit-events.patch b/upstart-audit-events.patch
new file mode 100644
index 0000000..2329f8d
--- /dev/null
+++ b/upstart-audit-events.patch
@@ -0,0 +1,199 @@
+diff -urp upstart-0.3.9.orig/compat/sysv/reboot.c upstart-0.3.9/compat/sysv/reboot.c
+--- upstart-0.3.9.orig/compat/sysv/reboot.c	2008-11-03 12:29:30.000000000 -0500
++++ upstart-0.3.9/compat/sysv/reboot.c	2008-11-05 08:16:22.000000000 -0500
+@@ -37,6 +37,9 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <utmp.h>
++#if 1 /* HAVE_LIBAUDIT */
++#include <libaudit.h>
++#endif
+ 
+ #include <linux/if.h>
+ #include <linux/hdreg.h>
+@@ -87,6 +90,7 @@ enum {
+ /* Prototypes for static functions */
+ static void down_drives     (void);
+ static void down_interfaces (void);
++static void send_audit_event(void);
+ 
+ 
+ /**
+@@ -277,6 +281,7 @@ main (int   argc,
+ 	 */
+ 	reboot (RB_ENABLE_CAD);
+ 	kill (1, SIGTSTP);
++	send_audit_event ();
+ 
+ 	/* Sync the disks */
+ 	chdir ("/");
+@@ -315,6 +320,23 @@ main (int   argc,
+ 	return 0;
+ }
+ 
++/**
++ * send_audit_event
++ *
++ * Send system shutdown audit event
++ **/
++static void
++send_audit_event (void)
++{
++#if 1 /* HAVE_LIBAUDIT */
++        int fd = audit_open ();
++        if (fd < 0)
++                return;
++        audit_log_user_message (fd, AUDIT_SYSTEM_SHUTDOWN, "init",
++                NULL, NULL, NULL, 1);
++        close (fd);
++#endif
++}
+ 
+ /**
+  * down_drives:
+diff -urp upstart-0.3.9.orig/compat/sysv/runlevel.c upstart-0.3.9/compat/sysv/runlevel.c
+--- upstart-0.3.9.orig/compat/sysv/runlevel.c	2008-11-03 12:29:30.000000000 -0500
++++ upstart-0.3.9/compat/sysv/runlevel.c	2008-11-05 08:22:17.000000000 -0500
+@@ -33,6 +33,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#if 1 /* HAVE_LIBAUDIT */
++#include <libaudit.h>
++#endif
+ 
+ #include <nih/macros.h>
+ #include <nih/alloc.h>
+@@ -44,6 +47,7 @@
+ 
+ /* Prototypes for static functions */
+ static void store (short type, pid_t pid, const char *user);
++static void send_audit_event (int old, int level);
+ 
+ 
+ /**
+@@ -109,6 +113,7 @@ main (int   argc,
+ 	/* Store the reboot time? */
+ 	if (reboot) {
+ 		store (BOOT_TIME, 0, "reboot");
++		send_audit_event (0, 0);
+ 		exit (0);
+ 	}
+ 
+@@ -143,6 +148,7 @@ main (int   argc,
+ 		prev = cur;
+ 		if (! prev)
+ 			prev = 'N';
++		send_audit_event (prev, set[0]);
+ 
+ 		cur = set[0];
+ 	}
+@@ -203,3 +209,35 @@ store (short       type,
+ 	/* Write wtmp entry */
+ 	updwtmp (WTMP_FILE, &utmp);
+ }
++
++/**
++ * send_audit_event
++ * @old: current run level
++ * @level: new run level
++ *
++ * Send system runlevel change audit event. If level is 0, then 
++ * we consider this to be a reboot event.
++ **/
++static void
++send_audit_event (int old, int level)
++{
++#if 1 /* HAVE_LIBAUDIT */
++        int fd = audit_open ();
++
++        if (fd < 0)
++                return;
++
++	if (level) {
++		char buf[64];
++
++	        snprintf (buf, sizeof (buf),
++			"old-level=%c new-level=%c", old, level);
++        	audit_log_user_message (fd, AUDIT_SYSTEM_RUNLEVEL, buf,
++                	NULL, NULL, NULL, 1);
++	} else
++        	audit_log_user_message (fd, AUDIT_SYSTEM_BOOT, "init",
++                	NULL, NULL, NULL, 1);
++        close (fd);
++#endif
++}
++
+diff -urp upstart-0.3.9.orig/compat/sysv/shutdown.c upstart-0.3.9/compat/sysv/shutdown.c
+--- upstart-0.3.9.orig/compat/sysv/shutdown.c	2008-11-03 12:29:30.000000000 -0500
++++ upstart-0.3.9/compat/sysv/shutdown.c	2008-11-05 08:16:22.000000000 -0500
+@@ -38,6 +38,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#if 1 /* HAVE_LIBAUDIT */
++#include <libaudit.h>
++#endif
+ 
+ #include <nih/macros.h>
+ #include <nih/alloc.h>
+@@ -452,6 +455,23 @@ runlevel_setter (NihOption  *option,
+ 	return 0;
+ }
+ 
++/**
++ * send_audit_event
++ *
++ * Send system shutdown audit event
++ **/
++static void
++send_audit_event (void)
++{
++#if 1 /* HAVE_LIBAUDIT */
++	int fd = audit_open ();
++	if (fd < 0)
++		return;
++	audit_log_user_message (fd, AUDIT_SYSTEM_SHUTDOWN, "init",
++		NULL, NULL, NULL, 1);
++	close (fd);
++#endif
++}
+ 
+ /**
+  * shutdown_now:
+@@ -496,6 +516,7 @@ shutdown_now (void)
+ 	NIH_MUST (message = upstart_message_new (NULL, UPSTART_INIT_DAEMON,
+ 						 UPSTART_EVENT_EMIT,
+ 						 "runlevel", args, env));
++	send_audit_event ();
+ 
+ 	/* Send the message */
+ 	if (nih_io_message_send (message, sock) < 0) {
+@@ -513,7 +534,6 @@ shutdown_now (void)
+ 		nih_fatal (_("Unable to send message: %s"), err->message);
+ 		exit (1);
+ 	}
+-
+ 	unlink (ETC_NOLOGIN);
+ 	nih_main_unlink_pidfile ();
+ 
+diff -up upstart-0.3.9/compat/sysv/Makefile.in.foo upstart-0.3.9/compat/sysv/Makefile.in
+--- upstart-0.3.9/compat/sysv/Makefile.in.foo	2009-04-27 15:53:35.000000000 -0400
++++ upstart-0.3.9/compat/sysv/Makefile.in	2009-04-27 15:53:55.000000000 -0400
+@@ -280,13 +280,13 @@ EXTRA_DIST = $(manpages)
+ @COMPAT_SYSV_TRUE@man_MANS = $(manpages)
+ reboot_SOURCES = reboot.c
+ reboot_LDFLAGS = -static
+-reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
++reboot_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
+ runlevel_SOURCES = runlevel.c
+ runlevel_LDFLAGS = -static
+-runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL)
++runlevel_LDADD = ../../nih/libnih.la $(LTLIBINTL) -laudit
+ shutdown_SOURCES = shutdown.c
+ shutdown_LDFLAGS = -static
+-shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
++shutdown_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL) -laudit
+ telinit_SOURCES = telinit.c
+ telinit_LDFLAGS = -static
+ telinit_LDADD = ../../upstart/libupstart.la ../../nih/libnih.la $(LTLIBINTL)
diff --git a/upstart-fedora-buglist.patch b/upstart-fedora-buglist.patch
new file mode 100644
index 0000000..a89c43b
--- /dev/null
+++ b/upstart-fedora-buglist.patch
@@ -0,0 +1,20 @@
+--- upstart-0.3.11/configure	2009-06-19 20:03:59.000000000 +0200
++++ upstart-0.3.11-adj/configure	2009-06-22 14:51:40.000000000 +0200
+@@ -749,7 +749,7 @@
+ PACKAGE_TARNAME='upstart'
+ PACKAGE_VERSION='0.3.11'
+ PACKAGE_STRING='upstart 0.3.11'
+-PACKAGE_BUGREPORT='upstart-devel@lists.ubuntu.com'
++PACKAGE_BUGREPORT='fedora-devel-list@redhat.com'
+ 
+ ac_unique_file="init/main.c"
+ # Factoring default headers for most tests.
+@@ -1655,7 +1655,7 @@
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ 
+-Report bugs to <upstart-devel@lists.ubuntu.com>.
++Report bugs to <fedora-devel-list@redhat.com>.
+ _ACEOF
+ ac_status=$?
+ fi
diff --git a/upstart-force-on-shutdown-reboot.patch b/upstart-force-on-shutdown-reboot.patch
new file mode 100644
index 0000000..e29e9ee
--- /dev/null
+++ b/upstart-force-on-shutdown-reboot.patch
@@ -0,0 +1,56 @@
+diff -up upstart-0.3.9/compat/sysv/reboot.c.foo upstart-0.3.9/compat/sysv/reboot.c
+--- upstart-0.3.9/compat/sysv/reboot.c.foo	2008-02-15 16:52:30.000000000 -0500
++++ upstart-0.3.9/compat/sysv/reboot.c	2008-02-15 17:47:37.000000000 -0500
+@@ -36,6 +36,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <utmp.h>
+ 
+ #include <linux/if.h>
+ #include <linux/hdreg.h>
+@@ -158,12 +159,31 @@ static NihOption options[] = {
+ 	NIH_OPTION_LAST
+ };
+ 
++static char get_runlevel(void)
++{
++	struct utmp utmp, *lvl;
++	char *rl, runlevel = 0;
++
++	if ((rl = getenv("RUNLEVEL")) != NULL)
++		return *rl;
++
++	memset(&utmp, 0, sizeof(utmp));
++	utmp.ut_type = RUN_LVL;
++	setutent();
++	lvl = getutid(&utmp);
++	if (lvl)
++		runlevel = lvl->ut_pid % 256;
++	endutent();
++	return runlevel;	
++}
++
+ 
+ int
+ main (int   argc,
+       char *argv[])
+ {
+ 	char **args;
++	char level;
+ 	int    mode;
+ 
+ 	nih_main_init (argv[0]);
+@@ -211,6 +231,12 @@ main (int   argc,
+ 
+ 	if (exit_only)
+ 		exit (0);
++		
++	level = get_runlevel();
++	if (level) {
++		if (level == '0' || level == '6')
++			force = TRUE;
++	}
+ 
+ 	/* Normally we just exec shutdown, which notifies everyone and
+ 	 * signals init.
diff --git a/upstart-gcc43.patch b/upstart-gcc43.patch
new file mode 100644
index 0000000..e7d0600
--- /dev/null
+++ b/upstart-gcc43.patch
@@ -0,0 +1,11 @@
+diff -up upstart-0.3.9/upstart/wire.c.foo upstart-0.3.9/upstart/wire.c
+--- upstart-0.3.9/upstart/wire.c.foo	2008-02-01 13:35:33.000000000 -0500
++++ upstart-0.3.9/upstart/wire.c	2008-02-01 13:35:33.000000000 -0500
+@@ -28,6 +28,7 @@
+ 
+ #include <stdarg.h>
+ #include <string.h>
++#include <limits.h>
+ 
+ #include <nih/macros.h>
+ #include <nih/alloc.h>
diff --git a/upstart-initctl-man.patch b/upstart-initctl-man.patch
new file mode 100644
index 0000000..097bbdc
--- /dev/null
+++ b/upstart-initctl-man.patch
@@ -0,0 +1,11 @@
+--- upstart-0.3.9/util/man/initctl.8-orig	2008-04-09 16:52:23.000000000 -0400
++++ upstart-0.3.9/util/man/initctl.8	2008-04-24 01:42:57.000000000 -0400
+@@ -14,7 +14,7 @@
+ .IR COMMAND .
+ 
+ Normally it is invoked directly with the command specified as the first
+-non-option argument, however symbolic or hard links may be used so that
++non-option argument; however, symbolic or hard links may be used so that
+ it is invoked as the name of a command, in which case it behaves
+ accordingly.
+ .\"
diff --git a/upstart-rpm.patch b/upstart-rpm.patch
new file mode 100644
index 0000000..5d6611c
--- /dev/null
+++ b/upstart-rpm.patch
@@ -0,0 +1,23 @@
+=== modified file 'nih/file.c'
+--- nih/file.c	2007-06-03 12:32:56 +0000
++++ nih/file.c	2008-03-17 02:47:17 +0000
+@@ -375,6 +375,18 @@
+ 	if (ptr && (! strncmp (ptr, ".dpkg-", 6)))
+ 		return TRUE;
+ 
++	/* Matches rpm temp files */
++	if (ptr && (! strncmp (ptr, ".rpmsave",9)))
++		return TRUE;
++	if (ptr && (! strncmp (ptr, ".rpmorig",9)))
++		return TRUE;
++	if (ptr && (! strncmp (ptr, ".rpmnew",8)))
++		return TRUE;
++
++	/* More rpm temp file matching */
++	ptr = strrchr (path, ';');
++	if (ptr && strspn (ptr + 1, "abcdefABCDEF0123456789") == 8 && !ptr[9])
++		return TRUE;
+ 
+ 	return FALSE;
+ }
+
diff --git a/upstart-save-state-across-reexec.patch b/upstart-save-state-across-reexec.patch
new file mode 100644
index 0000000..68001d1
--- /dev/null
+++ b/upstart-save-state-across-reexec.patch
@@ -0,0 +1,429 @@
+diff -uNr upstart-0.3.9.orig/init/main.c upstart-0.3.9/init/main.c
+--- upstart-0.3.9.orig/init/main.c	2009-01-23 13:44:32.000000000 -0500
++++ upstart-0.3.9/init/main.c	2009-01-23 13:44:54.000000000 -0500
+@@ -59,6 +59,7 @@
+ #include "cfgfile.h"
+ #include "paths.h"
+ #include "tty.h"
++#include "restore.h"
+ 
+ 
+ /* Prototypes for static functions */
+@@ -278,6 +279,10 @@
+ 		exit (1);
+ 	}
+ 
++	/* Restore the state of previously active jobs, if re-exec'd by
++         * a previously running init. */
++
++	if (restart) restore_configuration(args);
+ 
+ 	/* Generate and run the startup event or read the state from the
+ 	 * init daemon that exec'd us
+@@ -534,6 +539,8 @@
+ 	NihError   *err;
+ 	const char *loglevel;
+ 	sigset_t    mask, oldmask;
++	char **args;
++	size_t len;
+ 
+ 	nih_assert (argv0 != NULL);
+ 	nih_assert (signal != NULL);
+@@ -559,7 +566,20 @@
+ 	} else {
+ 		loglevel = NULL;
+ 	}
+-	execl (argv0, argv0, "--restart", loglevel, NULL);
++	args = nih_str_array_new(NULL);
++	len = 0;
++	if (args) args = nih_str_array_add(&args, NULL, &len, argv0);
++	if (args) args = nih_str_array_add(&args, NULL, &len, "--restart");
++	if (args && loglevel)
++		args = nih_str_array_add(&args, NULL, &len, loglevel);
++	if (args) save_current_configuration(&args, NULL, &len);
++	if (args) {
++		execv (argv0, args);
++		nih_free(args);
++	} else {
++		nih_warn (_("Unable to save list of currently running jobs"));
++		execl(argv0, argv0, "--restart", loglevel, NULL);
++	}
+ 	nih_error_raise_system ();
+ 
+ 	err = nih_error_get ();
+diff -uNr upstart-0.3.9.orig/init/Makefile.in upstart-0.3.9/init/Makefile.in
+--- upstart-0.3.9.orig/init/Makefile.in	2009-01-23 13:44:32.000000000 -0500
++++ upstart-0.3.9/init/Makefile.in	2009-01-23 13:44:54.000000000 -0500
+@@ -72,7 +72,7 @@
+ PROGRAMS = $(sbin_PROGRAMS)
+ am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \
+ 	job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \
+-	notify.$(OBJEXT) cfgfile.$(OBJEXT)
++	notify.$(OBJEXT) cfgfile.$(OBJEXT) restore.$(OBJEXT)
+ init_OBJECTS = $(am_init_OBJECTS)
+ am__DEPENDENCIES_1 =
+ init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \
+@@ -315,7 +315,8 @@
+ 	event.c event.h \
+ 	control.c control.h \
+ 	notify.c notify.h \
+-	cfgfile.c cfgfile.h
++	cfgfile.c cfgfile.h \
++	restore.c restore.h
+ 
+ init_LDFLAGS = -static
+ init_LDADD = \
+diff -uNr upstart-0.3.9.orig/init/restore.c upstart-0.3.9/init/restore.c
+--- upstart-0.3.9.orig/init/restore.c	1969-12-31 19:00:00.000000000 -0500
++++ upstart-0.3.9/init/restore.c	2009-01-23 13:44:54.000000000 -0500
+@@ -0,0 +1,333 @@
++/* Modifications to upstart to allow passing of the state of currently
++ * running jobs when upstart re-execs itself.
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif /* HAVE_CONFIG_H */
++
++
++#include <sys/types.h>
++#include <string.h>
++#include <nih/string.h>
++#include <nih/logging.h>
++#include <nih/alloc.h>
++#include "job.h"
++#include "restore.h"
++
++
++/**
++ * store_pid:
++ * @proc:    pointer to a JobProcess structure or NULL
++ * @args:    array of arguments
++ * @parent:  parent of @args
++ * @len:     current length of @args
++ * 
++ * Does nothing if @args is null.
++ * Pushes "X" onto @args if @args is non-null but @process is null.
++ * Otherwise: extracts the pid from @process, creates a hexadecimal string
++ * form of it, pushes a copy onto the array @args, then frees the original.
++ */
++
++void store_pid(JobProcess *proc, char ***args, const void *parent, size_t *len)
++{
++	char *pidstr;
++	if (! *args) return;
++	pidstr = (proc ? nih_sprintf(NULL, "%x", proc->pid) : "X");
++
++	if (! pidstr) {
++		nih_error("Unable to allocate storage to save process id");
++		*args = NULL;
++		return;
++	}
++	if (! nih_str_array_add(args, parent, len, pidstr)) {
++		nih_error("Unable to add process id to argument list");
++		*args = NULL;
++	}
++
++	if (proc) nih_free(pidstr);
++}
++ 
++/**
++ * unpack_pid:
++ * @pidstr: hexadecimal string created by pack_pid
++ * @err: pointer to flag to set if error occurs
++ *
++ * Returns the process id corresponding to the string passed in pidstr.
++ * If an error occurs, returns 0 and sets the flag pointed to by @err.
++ **/
++
++pid_t unpack_pid(char *pidstr, int *err) {
++	pid_t result = 0;
++	while (*pidstr) {
++		unsigned char c = *pidstr++;
++		result <<= 4;
++		if (c >= '0' && c <= '9') result += (c-'0');
++		else if (c >= 'a' && c <= 'f') result += 10 + (c-'a');
++		else {
++			*err = 1;
++			return 0;
++		}
++	}
++	return result;
++}
++
++/**
++ * retrieve_pid:
++ * @arg: 	pointer to array of arguments from which to read pid string
++ * @jobname: 	name of job whose pids are being retrieved
++ * @err: 	pointer to flag to set if error occurs
++ * @pid: 	pointer to location to hold the retrieved process id
++ * @present:	pointer to a location to hold 1 if the process id was present
++ *
++ * Reads a process id or no-process-present indicator from the hexadecimal
++ * string pointed to by @arg, increments @arg to point to the next string in
++ * the array unless it already points to a null string, and stores into
++ * @present a value of 0 or 1 indicating whether or not a process id is
++ * present, and stores into @pid the unpacked process id (or zero if there
++ * is no process present or an error occurred). If an error occured, sets
++ * the flag pointed to by @err and printes an error message.
++ **/
++
++void retrieve_pid(char ***arg, char *jobname, int *err,
++						pid_t *pid, int *present)
++{
++	*pid = 0;
++	*present = 0;
++	char *str;
++	if (! arg || ! *arg || ! **arg) {
++		nih_error("Ran out of arguments when restoring job %s",
++			  jobname);
++		*err = 1;
++		return;
++	}
++	str = **arg;
++	if (str) ++(*arg);
++	if (strcmp(str, "X")==0) return;
++	*present = 1;
++	*pid = unpack_pid(str, err);
++	if (*err) nih_error("Cannot parse pid %s for job %s", str, jobname);
++}
++
++/**
++ * restore_pid:
++ * @proc: 	pointer to a JobProcess structure, or NULL
++ * @pid: 	process id
++ * @present: 	integer which is 1 if process id is applicable
++ * @jobname:	name of job whose process ids are being restored
++ *
++ * Checks that the non-null status of @proc matches the true/false
++ * status of @present. If there is a mismatch, prints an error message.
++ * If @present is true and @proc is non-null, stores the process id from
++ * @pid into the JobProcess structure pointed to by @proc.
++ */
++
++void restore_pid(JobProcess *proc, pid_t pid, int present, char *jobname)
++{
++	if (proc == NULL && ! present) return;
++	if (proc != NULL && present) {
++		proc->pid = pid;
++		return;
++	}
++	nih_error("Unable to restore process id for job %s", jobname);
++}
++
++/**
++ * save_current_configuration:
++ * @args:   array of arguments to pass to new init
++ * @parent: parent of @args
++ * @len:    current length of @args
++ *
++ * Pushes, onto the array @args, information about currently running
++ * jobs. Each job consists of seven arguments:
++ *   (1) The job name
++ *   (2) A 3-character state/goal string:
++ *         First character for the goal: 0=goal JOB_STOP, 1=goal JOB_START
++ *         Second character for the current state:
++ *             W=JOB_WAITING,
++ *             S=JOB_STARTING, A=JOB_PRE_START, B=JOB_SPAWNED, C=JOB_POST_START,
++ *             R=JOB_RUNNING,
++ *             T=JOB_STOPPING, X=JOB_PRE_STOP, Y=JOB_KILLED, Z=JOB_POST_STOP
++ *         Third character: N=normal job, I=instance job
++ *   (3) The associated PROCESS_MAIN process id
++ *   (4) The associated PROCESS_PRE_START process id
++ *   (5) The associated PROCESS_POST_START process id
++ *   (6) The associated PROCESS_PRE_STOP process id
++ *   (7) The associated PROCESS_POST_STOP process id
++ * Process ids are in hexadecimal using lower-case letters (0-9,a-f),
++ * or 0 if there is a JobProcess structure but no running process, or
++ * "X" if there is no JobProcess structure.
++ *
++ */
++ 
++void save_current_configuration(char ***args, const void *parent, size_t *len)
++{
++	NIH_HASH_FOREACH(jobs, iter) {
++		Job *job = (Job *) iter;
++		char goal_state[4];
++		JobProcess **pids;
++
++		
++		if (job->replacement_for != NULL) continue;
++		if (job->state == JOB_DELETED) continue;
++		if (job->instance && ! job->instance_of) continue;
++		
++		if (! nih_str_array_add(args, parent, len, job->name))
++			return;
++		
++		if (job->goal == JOB_START) goal_state[0] = '1';
++		else goal_state[0] = '0';
++		
++		switch (job->state)
++			{
++			case JOB_WAITING:    goal_state[1] = 'W'; break;
++			case JOB_STARTING:   goal_state[1] = 'S'; break;
++			case JOB_PRE_START:  goal_state[1] = 'A'; break;
++			case JOB_SPAWNED:    goal_state[1] = 'B'; break;
++			case JOB_POST_START: goal_state[1] = 'C'; break;
++			case JOB_RUNNING:    goal_state[1] = 'R'; break;
++			case JOB_STOPPING:   goal_state[1] = 'T'; break;
++			case JOB_PRE_STOP:   goal_state[1] = 'X'; break;
++			case JOB_KILLED:     goal_state[1] = 'Y'; break;
++			case JOB_POST_STOP:  goal_state[1] = 'Z'; break;
++			default:             goal_state[1] = '?';      
++			}
++		if (job->instance_of) goal_state[2] = 'I';
++		else goal_state[2] = 'N';
++		goal_state[3] = 0;
++		
++		if (! nih_str_array_add(args, parent, len, goal_state))
++			return;
++		
++		pids = job->process;
++		store_pid(pids[PROCESS_MAIN],       args, parent, len);
++		store_pid(pids[PROCESS_PRE_START],  args, parent, len);
++		store_pid(pids[PROCESS_POST_START], args, parent, len);
++		store_pid(pids[PROCESS_PRE_STOP],   args, parent, len);
++		store_pid(pids[PROCESS_POST_STOP],  args, parent, len);
++	}
++}
++
++/**
++ * restore_job_state:
++ * @jobname: name of job whose state we are to restore
++ * @goal_state: the goal/state string generated by save_current_configuration
++ * @pids: array of five process ids 
++ * @presents: array of five integers indicating which process ids are applicable
++ */
++
++void restore_job_state (char *jobname, char *goal_state,
++				pid_t *pids, int *presents)
++{
++	Job *job;
++	JobGoal goal = JOB_STOP;
++	JobState state = JOB_WAITING;
++	int is_instance = 0;
++	int is_invalid = 0;
++	JobProcess **procs;
++
++	if (jobname == NULL) {
++		nih_error("Missing name for restored job");
++		return;
++	}
++
++	if (goal_state == NULL) {
++		nih_error("Missing goal/state for restored job %s", jobname);
++		return;
++	}
++	
++	if (strlen(goal_state) != 3) {
++		nih_error("Invalid length goal/state %s for restored job %s",
++			  goal_state, jobname);
++		return;
++	}
++
++	switch (goal_state[0])
++		{
++		case '0': goal = JOB_STOP; break;
++		case '1': goal = JOB_START; break;
++		default: is_invalid = 1; break;
++		}
++	
++	switch (goal_state[1])
++		{
++		case 'W': state = JOB_WAITING; break;
++		case 'S': state = JOB_STARTING; break;
++		case 'A': state = JOB_PRE_START; break;
++		case 'B': state = JOB_SPAWNED; break;
++		case 'C': state = JOB_POST_START; break;
++		case 'R': state = JOB_RUNNING; break;
++		case 'T': state = JOB_STOPPING; break;
++		case 'X': state = JOB_PRE_STOP; break;
++		case 'Y': state = JOB_KILLED; break;
++		case 'Z': state = JOB_POST_STOP; break;
++		default: is_invalid = 1;
++		}
++
++	switch (goal_state[2])
++		{
++		case 'N': break;
++		case 'I': is_instance = 1; break;
++		default: is_invalid = 1;
++		}
++	
++	if (is_invalid) {
++		nih_error("Invalid goal/state %s for restored job %s",
++			  goal_state, jobname);
++		return;
++	}
++	job = job_find_by_name(jobname);
++	if (! job) {
++		nih_error("Unknown job %s passed to re-exec", jobname);
++		return;
++	}				
++	if (is_instance) {
++		if (! job->instance) {
++			nih_error("Can not restore job %s as instance job",
++				  jobname);
++			return;
++		}
++		job = job_instance(job);
++	} else {
++		if (job->instance) {
++			nih_error("Can not restore job %s as non-instance job",
++				  jobname);
++			return;
++		}
++	}
++	job->goal = goal;
++	job->state = state;
++	procs=job->process;
++	restore_pid(procs[PROCESS_MAIN],       pids[0], presents[0], jobname);
++	restore_pid(procs[PROCESS_PRE_START],  pids[1], presents[1], jobname);
++	restore_pid(procs[PROCESS_POST_START], pids[2], presents[2], jobname);
++	restore_pid(procs[PROCESS_PRE_STOP],   pids[3], presents[3], jobname);
++	restore_pid(procs[PROCESS_POST_STOP],  pids[4], presents[4], jobname);
++}
++
++/**
++ * restore_current_configuration:
++ * @args:   non-option arguments that were passed to the new init
++ */
++
++void restore_configuration(char **args)
++{
++	if (! args) return;
++	
++	char **arg = args;
++	while (arg && *arg) {
++		char *jobname = *(arg++);
++		char *goal_state = *arg;
++		pid_t pids[5];
++		int presents[5];
++		int is_invalid = 0;
++
++		if (*arg) ++arg;
++		for (int i = 0; i < 5; i++) 
++			retrieve_pid(&arg, jobname, &is_invalid,
++					&pids[i], &presents[i]);
++
++		if (! is_invalid)
++			restore_job_state (jobname, goal_state, pids, presents);
++	}
++}
+diff -uNr upstart-0.3.9.orig/init/restore.h upstart-0.3.9/init/restore.h
+--- upstart-0.3.9.orig/init/restore.h	1969-12-31 19:00:00.000000000 -0500
++++ upstart-0.3.9/init/restore.h	2009-01-23 13:44:54.000000000 -0500
+@@ -0,0 +1,13 @@
++#ifndef INIT_RESTORE_H
++#define INIT_RESTORE_H
++
++#include <nih/string.h>
++
++NIH_BEGIN_EXTERN
++
++void save_current_configuration(char ***args, const void *parent, size_t *len);
++void restore_configuration(char **args);
++
++NIH_END_EXTERN
++
++#endif /* INIT_RESTORE_H */
diff --git a/upstart-telinit-u.patch b/upstart-telinit-u.patch
new file mode 100644
index 0000000..4e39757
--- /dev/null
+++ b/upstart-telinit-u.patch
@@ -0,0 +1,113 @@
+diff -urN upstart-0.3.9-old/compat/sysv/telinit.c upstart-0.3.9/compat/sysv/telinit.c
+--- upstart-0.3.9-old/compat/sysv/telinit.c	2008-04-09 00:52:06.000000000 -0400
++++ upstart-0.3.9/compat/sysv/telinit.c	2008-04-09 01:02:39.000000000 -0400
+@@ -113,9 +113,11 @@
+ 				  NULL, UPSTART_INIT_DAEMON,
+ 				  UPSTART_EVENT_EMIT, "runlevel", args, NULL));
+ 		break;
+-	case 'u':
+-		kill (UPSTART_INIT_DAEMON, SIGTERM);
+-		exit (0);
++	case 'u':
++		NIH_MUST (message = upstart_message_new (
++				  NULL, UPSTART_INIT_DAEMON,
++				  UPSTART_RESTART, NULL));
++		break;
+ 	default:
+ 		/* Ignore other arguments */
+ 		exit (0);
+diff -urN upstart-0.3.9-old/init/control.c upstart-0.3.9/init/control.c
+--- upstart-0.3.9-old/init/control.c	2008-04-09 00:52:06.000000000 -0400
++++ upstart-0.3.9/init/control.c	2008-04-09 01:01:41.000000000 -0400
+@@ -29,6 +29,7 @@
+ 
+ #include <errno.h>
+ #include <unistd.h>
++#include <signal.h>
+ #include <fnmatch.h>
+ 
+ #include <nih/macros.h>
+@@ -52,6 +53,8 @@
+ static void control_error_handler      (void  *data, NihIo *io);
+ static int  control_version_query      (void *data, pid_t pid,
+ 					UpstartMessageType type);
++static int  control_restart            (void *data, pid_t pid,
++					UpstartMessageType type);
+ static int  control_log_priority       (void *data, pid_t pid,
+ 					UpstartMessageType type,
+ 					NihLogLevel priority);
+@@ -102,6 +105,8 @@
+ static UpstartMessage message_handlers[] = {
+ 	{ -1, UPSTART_VERSION_QUERY,
+ 	  (UpstartMessageHandler)control_version_query },
++	{ -1, UPSTART_RESTART,
++	  (UpstartMessageHandler)control_restart },
+ 	{ -1, UPSTART_PUSH_TTY,
+ 	  (UpstartMessageHandler)control_push_tty },
+ 	{ -1, UPSTART_POP_TTY,
+@@ -319,6 +324,32 @@
+ }
+ 
+ /**
++ * control_restart:
++ * @data: data pointer,
++ * @pid: origin process id,
++ * @type: message type received.
++ *
++ * This function is called when another process on the system asks us to
++ * re-execute
++ *
++ * Returns: zero on success, negative value on raised error.
++ **/
++static int
++control_restart (void               *data,
++		 pid_t               pid,
++		 UpstartMessageType  type)
++{
++	nih_assert (pid > 0);
++	nih_assert (type == UPSTART_RESTART);
++
++	nih_info (_("Control request to restart daemon"));
++
++	kill(getpid(), SIGTERM);
++
++	return 0;
++}
++
++/**
+  * control_push_tty:
+  * @data: data pointer,
+  * @pid: origin process id,
+diff -urN upstart-0.3.9-old/upstart/message.c upstart-0.3.9/upstart/message.c
+--- upstart-0.3.9-old/upstart/message.c	2008-04-09 00:52:06.000000000 -0400
++++ upstart-0.3.9/upstart/message.c	2008-04-09 00:55:03.000000000 -0400
+@@ -259,6 +259,8 @@
+ 	switch (type) {
+ 	case UPSTART_NO_OP:
+ 		break;
++	case UPSTART_RESTART:
++		break;
+ 	case UPSTART_VERSION_QUERY:
+ 		break;
+ 	case UPSTART_POP_TTY:
+@@ -564,6 +566,9 @@
+ 	case UPSTART_VERSION_QUERY:
+ 		ret = handler (data, cred.pid, type);
+ 		break;
++	case UPSTART_RESTART:
++		ret = handler (data, cred.pid, type);
++		break;
+ 	case UPSTART_POP_TTY:
+ 		ret = handler (data, cred.pid, type);
+ 		break;
+diff -urN upstart-0.3.9-old/upstart/message.h upstart-0.3.9/upstart/message.h
+--- upstart-0.3.9-old/upstart/message.h	2008-04-09 00:52:06.000000000 -0400
++++ upstart-0.3.9/upstart/message.h	2008-04-09 00:55:58.000000000 -0400
+@@ -67,6 +67,7 @@
+ 	UPSTART_NO_OP              = 0x0000,
+ 	UPSTART_VERSION_QUERY      = 0x0001,
+ 	UPSTART_LOG_PRIORITY       = 0x0002,
++	UPSTART_RESTART            = 0x0005,
+ 	UPSTART_VERSION            = 0x0010,
+ 	UPSTART_PUSH_TTY           = 0x0011,
+ 	UPSTART_POP_TTY            = 0x0012,
diff --git a/upstart-tty-stack.patch b/upstart-tty-stack.patch
new file mode 100644
index 0000000..271aff2
--- /dev/null
+++ b/upstart-tty-stack.patch
@@ -0,0 +1,1684 @@
+diff -up init/control.c.old init/control.c
+--- init/control.c.old	2009-06-22 11:59:11.000000000 +0200
++++ init/control.c	2009-06-22 11:59:26.000000000 +0200
+@@ -43,6 +43,7 @@
+ #include <upstart/message.h>
+ 
+ #include "job.h"
++#include "tty.h"
+ #include "control.h"
+ #include "notify.h"
+ 
+@@ -57,6 +58,11 @@ static int  control_log_priority       (
+ static int  control_job_find           (void *data, pid_t pid,
+ 					UpstartMessageType type,
+ 					const char *pattern);
++static int  control_push_tty           (void *data, pid_t pid,
++					UpstartMessageType type,
++					const char *device);
++static int  control_pop_tty            (void *data, pid_t pid,
++					UpstartMessageType type);
+ static int  control_job_query          (void *data, pid_t pid,
+ 					UpstartMessageType type,
+ 					const char *name, unsigned int id);
+@@ -96,6 +102,10 @@ NihIo *control_io = NULL;
+ static UpstartMessage message_handlers[] = {
+ 	{ -1, UPSTART_VERSION_QUERY,
+ 	  (UpstartMessageHandler)control_version_query },
++	{ -1, UPSTART_PUSH_TTY,
++	  (UpstartMessageHandler)control_push_tty },
++	{ -1, UPSTART_POP_TTY,
++	  (UpstartMessageHandler)control_pop_tty },
+ 	{ -1, UPSTART_LOG_PRIORITY,
+ 	  (UpstartMessageHandler)control_log_priority },
+ 	{ -1, UPSTART_JOB_FIND,
+@@ -308,6 +318,66 @@ control_send_instance (pid_t  pid,
+ 	nih_io_send_message (control_io, message);
+ }
+ 
++/**
++ * control_push_tty:
++ * @data: data pointer,
++ * @pid: origin process id,
++ * @type: message type received.
++ *
++ * This function is called to change the current tty.
++ *
++ * Returns: zero on success, negative value on raised error.
++ **/
++static int
++control_push_tty (void               *data,
++		 pid_t               pid,
++		 UpstartMessageType  type,
++		 const char          *device)
++{
++	NihIoMessage *reply;
++
++	nih_assert (pid > 0);
++	nih_assert (type == UPSTART_PUSH_TTY);
++
++	nih_info (_("Control request to change tty"));
++
++	NIH_MUST (reply = upstart_message_new (control_io, pid,
++					       UPSTART_TTY,
++					       push_tty (device)));
++	nih_io_send_message (control_io, reply);
++
++	return 0;
++}
++
++/**
++ * control_pop_tty:
++ * @data: data pointer,
++ * @pid: origin process id,
++ * @type: message type received.
++ *
++ * This function is called to revert the most recent tty change.
++ *
++ * Returns: zero on success, negative value on raised error.
++ **/
++static int
++control_pop_tty (void               *data,
++		 pid_t               pid,
++		 UpstartMessageType  type)
++{
++	NihIoMessage *reply;
++
++	nih_assert (pid > 0);
++	nih_assert (type == UPSTART_POP_TTY);
++
++	nih_info (_("Control request to revert changed tty"));
++
++	NIH_MUST (reply = upstart_message_new (control_io, pid,
++					       UPSTART_TTY,
++					       pop_tty ()));
++	nih_io_send_message (control_io, reply);
++
++	return 0;
++}
+ 
+ /**
+  * control_version_query:
+diff -up init/main.c.old init/main.c
+--- init/main.c.old	2009-06-22 13:42:44.000000000 +0200
++++ init/main.c	2009-06-22 13:42:55.000000000 +0200
+@@ -58,6 +58,7 @@
+ #include "control.h"
+ #include "cfgfile.h"
+ #include "paths.h"
++#include "tty.h"
+ 
+ 
+ /* Prototypes for static functions */
+@@ -190,6 +191,8 @@ main (int   argc,
+ 	if (! (restart || rescue))
+ 		reset_console ();
+ 
++	tty_stack_init ();
++
+ 	/* Set the PATH environment variable */
+ 	setenv ("PATH", PATH, TRUE);
+ 
+diff -up init/Makefile.in.old init/Makefile.in
+--- init/Makefile.in.old	2009-06-22 11:56:34.000000000 +0200
++++ init/Makefile.in	2009-06-22 11:56:53.000000000 +0200
+@@ -72,9 +72,9 @@ am__EXEEXT_1 = test_process$(EXEEXT) tes
+ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(sbin_PROGRAMS)
+-am_init_OBJECTS = main.$(OBJEXT) process.$(OBJEXT) job.$(OBJEXT) \
+-	event.$(OBJEXT) control.$(OBJEXT) notify.$(OBJEXT) \
+-	cfgfile.$(OBJEXT)
++am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \
++	job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \
++	notify.$(OBJEXT) cfgfile.$(OBJEXT)
+ init_OBJECTS = $(am_init_OBJECTS)
+ am__DEPENDENCIES_1 =
+ init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \
+@@ -314,6 +314,7 @@ dist_man_MANS = \
+ 
+ init_SOURCES = \
+ 	main.c \
++	tty.c tty.h\
+ 	errors.h paths.h \
+ 	process.c process.h \
+ 	job.c job.h \
+@@ -474,6 +475,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_notify.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Po@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+diff -up init/process.c.old init/process.c
+--- init/process.c.old	2009-06-22 13:45:48.000000000 +0200
++++ init/process.c	2009-06-22 13:45:48.000000000 +0200
+@@ -51,6 +51,7 @@
+ #include "job.h"
+ #include "process.h"
+ #include "paths.h"
++#include "tty.h"
+ 
+ 
+ /* Prototypes for static functions */
+@@ -385,10 +386,11 @@ process_setup_console (Job         *job,
+ 
+ 		break;
+ 
+-	case CONSOLE_OUTPUT:
++	case CONSOLE_OUTPUT: {
+ 		/* Ordinary console input and output */
+-		fd = open (CONSOLE, O_RDWR | O_NOCTTY);
++		fd = open (current_tty (), O_RDWR | O_NOCTTY);
+ 		break;
++		}
+ 
+ 	case CONSOLE_OWNER:
+ 		/* As CONSOLE_OUTPUT but with ^C, etc. sent */
+diff -up init/tty.c.old init/tty.c
+--- init/tty.c.old	2009-06-22 13:45:48.000000000 +0200
++++ init/tty.c	2009-06-22 13:45:48.000000000 +0200
+@@ -0,0 +1,97 @@
++/* upstart
++ *
++ * tty.c - tty change events
++ *
++ * Copyright © 2007 Canonical Ltd.
++ * Author: Scott James Remnant <scott@ubuntu.com>.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
++ */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif /* HAVE_CONFIG_H */
++
++#include <unistd.h>
++#include <stdlib.h>
++#include <termios.h>
++#include <sys/ioctl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <nih/logging.h>
++#include <nih/string.h>
++#include <nih/alloc.h>
++
++#include "paths.h"
++
++static char **tty_stack = NULL;
++static size_t tty_stack_top = 0;
++
++/**
++ * tty_stack_init:
++ *
++ * Allocate the tty stack
++ **/
++void
++tty_stack_init (void)
++{
++	NIH_MUST (tty_stack = nih_str_array_new (NULL));
++}
++
++/**
++ * current_tty:
++ *
++ * Get the tty at the top of the stack
++ **/
++const char *
++current_tty (void)
++{
++	if (!tty_stack_top) return CONSOLE;
++	return tty_stack[tty_stack_top - 1];
++}
++
++/**
++ * tty_stack_init:
++ *
++ * Push a tty onto the tty stack
++ **/
++const char *
++push_tty (const char *tty)
++{
++	nih_assert (tty_stack != NULL);
++	NIH_MUST (nih_str_array_add (&tty_stack, NULL, &tty_stack_top, tty));
++
++	return current_tty ();
++}
++
++/**
++ * pop_tty:
++ *
++ * Pop a tty off of the tty stack
++ **/
++const char *
++pop_tty (void)
++{
++	nih_assert (tty_stack != NULL);
++	if (tty_stack_top == 0) return current_tty();
++	nih_free (tty_stack[tty_stack_top - 1]);
++	tty_stack[--tty_stack_top] = NULL;
++	tty_stack = nih_realloc (tty_stack, NULL,
++			sizeof (char *) * (tty_stack_top + 2));
++
++	return current_tty ();
++}
++
+diff -up init/tty.h.old init/tty.h
+--- init/tty.h.old	2009-06-22 13:45:48.000000000 +0200
++++ init/tty.h	2009-06-22 13:45:48.000000000 +0200
+@@ -0,0 +1,35 @@
++/* upstart
++ *
++ * Copyright © 2007 Canonical Ltd.
++ * Author: Scott James Remnant <scott@ubuntu.com>.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
++ */
++
++#ifndef INIT_TTY_H
++#define INIT_TTY_H
++
++#include <nih/macros.h>
++
++NIH_BEGIN_EXTERN
++
++const char *current_tty	   (void);
++const char *push_tty	   (const char *tty);
++const char *pop_tty	   (void);
++void	    tty_stack_init (void);
++
++NIH_END_EXTERN
++
++#endif /* INIT_TTY_H */
+diff -up po/ca.po.old po/ca.po
+--- po/ca.po.old	2009-06-22 13:45:48.000000000 +0200
++++ po/ca.po	2009-06-22 13:45:48.000000000 +0200
+@@ -22,46 +22,46 @@ msgstr ""
+ msgid "display list of commands"
+ msgstr "mostra aquesta ajuda i surt"
+ 
+-#: nih/command.c:141
++#: nih/command.c:139
+ #, c-format
+ msgid "For a list of commands, try `%s help'."
+ msgstr ""
+ 
+-#: nih/command.c:144
++#: nih/command.c:142
+ msgid "COMMAND [OPTION]... [ARG]..."
+ msgstr ""
+ 
+-#: nih/command.c:162
++#: nih/command.c:160
+ #, fuzzy, c-format
+ msgid "%s: missing command\n"
+ msgstr "%s: manca un argument: %s\n"
+ 
+-#: nih/command.c:170
++#: nih/command.c:168
+ #, fuzzy, c-format
+ msgid "%s: invalid command: %s\n"
+ msgstr "%s: l'opció és invàlida: --%s\n"
+ 
+-#: nih/command.c:181
++#: nih/command.c:179
+ #, c-format
+ msgid "%s [OPTION]..."
+ msgstr ""
+ 
+-#: nih/command.c:424
++#: nih/command.c:418
+ #, c-format
+ msgid "For more information on a command, try `%s COMMAND --help'.\n"
+ msgstr ""
+ 
+-#: nih/command.c:450
++#: nih/command.c:444
+ #, fuzzy, c-format
+ msgid "%s commands:\n"
+ msgstr "Opcions %s:\n"
+ 
+-#: nih/command.c:452
++#: nih/command.c:446
+ #, fuzzy, c-format
+ msgid "Other commands:\n"
+ msgstr "Altres opcions:\n"
+ 
+-#: nih/command.c:454
++#: nih/command.c:448
+ #, c-format
+ msgid "Commands:\n"
+ msgstr ""
+@@ -70,7 +70,7 @@ msgstr ""
+ msgid "Unhandled Error"
+ msgstr "Error no gestionat"
+ 
+-#: nih/io.c:1203
++#: nih/io.c:1198
+ msgid "Error while reading from descriptor"
+ msgstr "S'ha produït un error en llegir del descriptor"
+ 
+@@ -101,60 +101,60 @@ msgstr "mostra aquesta ajuda i surt"
+ msgid "output version information and exit"
+ msgstr "mostra la informació sobre la versió i surt"
+ 
+-#: nih/option.c:299
++#: nih/option.c:297
+ #, c-format
+ msgid "%s: invalid option: -%c\n"
+ msgstr "%s: l'opció és invàlida: -%c\n"
+ 
+-#: nih/option.c:392
++#: nih/option.c:390
+ #, c-format
+ msgid "%s: invalid option: --%s\n"
+ msgstr "%s: l'opció és invàlida: --%s\n"
+ 
+-#: nih/option.c:408
++#: nih/option.c:406
+ #, c-format
+ msgid "%s: unexpected argument: --%s\n"
+ msgstr "%s: no s'esperava l'argument: --%s\n"
+ 
+-#: nih/option.c:464
++#: nih/option.c:462
+ #, c-format
+ msgid "%s: missing argument: %s\n"
+ msgstr "%s: manca un argument: %s\n"
+ 
+-#: nih/option.c:664
++#: nih/option.c:660
+ #, fuzzy, c-format
+ msgid "%s: illegal argument: %s\n"
+ msgstr "%s: manca un argument: %s\n"
+ 
+-#: nih/option.c:862
++#: nih/option.c:858
+ msgid "Usage"
+ msgstr "Forma d'ús"
+ 
+-#: nih/option.c:866
++#: nih/option.c:862
+ msgid "[OPTION]..."
+ msgstr ""
+ 
+-#: nih/option.c:915
++#: nih/option.c:911
+ #, c-format
+ msgid "Report bugs to <%s>\n"
+ msgstr "Informeu-ne del errors a <%s>\n"
+ 
+-#: nih/option.c:941
++#: nih/option.c:937
+ #, c-format
+ msgid "%s options:\n"
+ msgstr "Opcions %s:\n"
+ 
+-#: nih/option.c:943
++#: nih/option.c:939
+ #, c-format
+ msgid "Other options:\n"
+ msgstr "Altres opcions:\n"
+ 
+-#: nih/option.c:945
++#: nih/option.c:941
+ #, c-format
+ msgid "Options:\n"
+ msgstr "Opcions:\n"
+ 
+-#: nih/watch.c:521
++#: nih/watch.c:560
+ msgid "Unable to watch directory"
+ msgstr ""
+ 
+@@ -305,82 +305,92 @@ msgstr ""
+ msgid "Deleting %s job"
+ msgstr "S'està tornant a exiecutar %s"
+ 
+-#: init/control.c:216
++#: init/control.c:225
+ #, fuzzy, c-format
+ msgid "Error on control socket: %s"
+ msgstr "S'ha produït un error en llegir el missatge de control: %s"
+ 
+-#: init/control.c:336
++#: init/control.c:345
++#, fuzzy
++msgid "Control request to change tty"
++msgstr "Petició de control per a iniciar %s"
++
++#: init/control.c:379
++#, fuzzy
++msgid "Control request to revert changed tty"
++msgstr "Petició de control per a iniciar %s"
++
++#: init/control.c:413
+ #, fuzzy
+ msgid "Control request for our version"
+ msgstr "Petició de control per a consultar l'estat de %s"
+ 
+-#: init/control.c:369
++#: init/control.c:446
+ #, fuzzy
+ msgid "Control request to change logging priority"
+ msgstr "Petició de control per a iniciar %s"
+ 
+-#: init/control.c:406
++#: init/control.c:483
+ #, fuzzy, c-format
+ msgid "Control request for jobs matching %s"
+ msgstr "Petició de control per a consultar l'estat de %s"
+ 
+-#: init/control.c:408
++#: init/control.c:485
+ #, fuzzy
+ msgid "Control request for all jobs"
+ msgstr "Petició de control per a consultar l'estat de %s"
+ 
+-#: init/control.c:470
++#: init/control.c:547
+ #, fuzzy, c-format
+ msgid "Control request for status of %s"
+ msgstr "Petició de control per a consultar l'estat de %s"
+ 
+-#: init/control.c:474
++#: init/control.c:551
+ #, fuzzy, c-format
+ msgid "Control request for status of job #%u"
+ msgstr "Petició de control per a consultar l'estat de %s"
+ 
+-#: init/control.c:528
++#: init/control.c:605
+ #, c-format
+ msgid "Control request to start %s"
+ msgstr "Petició de control per a iniciar %s"
+ 
+-#: init/control.c:532
++#: init/control.c:609
+ #, fuzzy, c-format
+ msgid "Control request to start job #%u"
+ msgstr "Petició de control per a iniciar %s"
+ 
+-#: init/control.c:615
++#: init/control.c:692
+ #, c-format
+ msgid "Control request to stop %s"
+ msgstr "Petició de control per a aturar %s"
+ 
+-#: init/control.c:619
++#: init/control.c:696
+ #, fuzzy, c-format
+ msgid "Control request to stop job #%u"
+ msgstr "Petició de control per a aturar %s"
+ 
+-#: init/control.c:748
++#: init/control.c:825
+ #, fuzzy, c-format
+ msgid "Control request to emit %s event"
+ msgstr "Petició de control per a aturar %s"
+ 
+-#: init/control.c:779
++#: init/control.c:856
+ #, c-format
+ msgid "Control request to subscribe %d to jobs"
+ msgstr "Petició de control per a subscriure %d als treballs"
+ 
+-#: init/control.c:810
++#: init/control.c:887
+ #, c-format
+ msgid "Control request to unsubscribe %d from jobs"
+ msgstr "Petició de control per a desubscriure %d dels treballs"
+ 
+-#: init/control.c:840
++#: init/control.c:917
+ #, c-format
+ msgid "Control request to subscribe %d to events"
+ msgstr ""
+ 
+-#: init/control.c:871
++#: init/control.c:948
+ #, c-format
+ msgid "Control request to unsubscribe %d from events"
+ msgstr ""
+@@ -485,7 +495,7 @@ msgid ""
+ "actually run /sbin/telinit."
+ msgstr ""
+ 
+-#: init/main.c:136 util/initctl.c:366 compat/sysv/reboot.c:203
++#: init/main.c:136 util/initctl.c:373 compat/sysv/reboot.c:203
+ #: compat/sysv/shutdown.c:322 compat/sysv/telinit.c:91
+ msgid "Need to be root"
+ msgstr "Es necessita ser root"
+@@ -657,6 +667,11 @@ msgstr "%s: l'opció és invàlida: --%s
+ msgid "%s: missing job name\n"
+ msgstr ""
+ 
++#: util/initctl.c:1889
++#, fuzzy, c-format
++msgid "%s: missing device name\n"
++msgstr "%s: manca un argument: %s\n"
++
+ #: util/initctl.c:1826
+ #, c-format
+ msgid "%s: missing event name\n"
+@@ -733,11 +748,11 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2119
++#: util/initctl.c:2239
+ msgid "Stop jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2120
++#: util/initctl.c:2240
+ msgid ""
+ "JOB is one or more job names that are to be stopped.\n"
+ "\n"
+@@ -745,11 +760,11 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2126
++#: util/initctl.c:2246
+ msgid "Query status of jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2127
++#: util/initctl.c:2247
+ msgid ""
+ "JOB is one or more job names that are to be queried.\n"
+ "\n"
+@@ -757,19 +772,19 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2133
++#: util/initctl.c:2253
+ msgid "List known jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2137
++#: util/initctl.c:2257
+ msgid "EVENT [ARG]..."
+ msgstr ""
+ 
+-#: util/initctl.c:2138
++#: util/initctl.c:2258
+ msgid "Emit an event."
+ msgstr ""
+ 
+-#: util/initctl.c:2139
++#: util/initctl.c:2259
+ msgid ""
+ "EVENT is the name of an event the init daemon should emit, which may have "
+ "zero or more arguments specified by ARG.  These may be matched in the job "
+@@ -780,27 +795,35 @@ msgid ""
+ "taken from the environment or ignored if not present there."
+ msgstr ""
+ 
+-#: util/initctl.c:2150
++#: util/initctl.c:2270
+ msgid "Receive notification of job state changes."
+ msgstr ""
+ 
+-#: util/initctl.c:2155
++#: util/initctl.c:2275
+ msgid "Receive notification of emitted events."
+ msgstr ""
+ 
+-#: util/initctl.c:2160
++#: util/initctl.c:2280
++msgid "Change the init daemon's tty device"
++msgstr ""
++
++#: util/initctl.c:2285
++msgid "Revert the last change to the init daemon's tty device"
++msgstr ""
++
++#: util/initctl.c:2290
+ msgid "Request the version of the init daemon."
+ msgstr ""
+ 
+-#: util/initctl.c:2163
++#: util/initctl.c:2293
+ msgid "PRIORITY"
+ msgstr ""
+ 
+-#: util/initctl.c:2164
++#: util/initctl.c:2294
+ msgid "Change the minimum priority of log messages from the init daemon"
+ msgstr ""
+ 
+-#: util/initctl.c:2166
++#: util/initctl.c:2296
+ msgid ""
+ "PRIORITY may be one of `debug' (messages useful for debugging upstart are "
+ "logged, equivalent to --debug on kernel command-line); `info' (messages "
+diff -up po/fr.po.old po/fr.po
+--- po/fr.po.old	2009-06-22 13:45:48.000000000 +0200
++++ po/fr.po	2009-06-22 13:45:48.000000000 +0200
+@@ -22,46 +22,46 @@ msgstr ""
+ msgid "display list of commands"
+ msgstr "afficher cette aide et quitter"
+ 
+-#: nih/command.c:141
++#: nih/command.c:139
+ #, c-format
+ msgid "For a list of commands, try `%s help'."
+ msgstr ""
+ 
+-#: nih/command.c:144
++#: nih/command.c:142
+ msgid "COMMAND [OPTION]... [ARG]..."
+ msgstr ""
+ 
+-#: nih/command.c:162
++#: nih/command.c:160
+ #, fuzzy, c-format
+ msgid "%s: missing command\n"
+ msgstr "%s : argument manquant : %s\n"
+ 
+-#: nih/command.c:170
++#: nih/command.c:168
+ #, fuzzy, c-format
+ msgid "%s: invalid command: %s\n"
+ msgstr "%s : option invalide : --%s\n"
+ 
+-#: nih/command.c:181
++#: nih/command.c:179
+ #, c-format
+ msgid "%s [OPTION]..."
+ msgstr ""
+ 
+-#: nih/command.c:424
++#: nih/command.c:418
+ #, c-format
+ msgid "For more information on a command, try `%s COMMAND --help'.\n"
+ msgstr ""
+ 
+-#: nih/command.c:450
++#: nih/command.c:444
+ #, fuzzy, c-format
+ msgid "%s commands:\n"
+ msgstr "%s options:\n"
+ 
+-#: nih/command.c:452
++#: nih/command.c:446
+ #, fuzzy, c-format
+ msgid "Other commands:\n"
+ msgstr "Autres options:\n"
+ 
+-#: nih/command.c:454
++#: nih/command.c:448
+ #, c-format
+ msgid "Commands:\n"
+ msgstr ""
+@@ -70,7 +70,7 @@ msgstr ""
+ msgid "Unhandled Error"
+ msgstr "Erreur non traitée"
+ 
+-#: nih/io.c:1203
++#: nih/io.c:1198
+ #, fuzzy
+ msgid "Error while reading from descriptor"
+ msgstr "Erreur lors de la lecture du descripteur"
+@@ -106,60 +106,60 @@ msgstr "afficher cette aide et quitter"
+ msgid "output version information and exit"
+ msgstr "affichage de l'information de version et sortie"
+ 
+-#: nih/option.c:299
++#: nih/option.c:297
+ #, c-format
+ msgid "%s: invalid option: -%c\n"
+ msgstr "%s: option ivalide: -%c\n"
+ 
+-#: nih/option.c:392
++#: nih/option.c:390
+ #, c-format
+ msgid "%s: invalid option: --%s\n"
+ msgstr "%s : option invalide : --%s\n"
+ 
+-#: nih/option.c:408
++#: nih/option.c:406
+ #, c-format
+ msgid "%s: unexpected argument: --%s\n"
+ msgstr "%s : argument inattendu : --%s\n"
+ 
+-#: nih/option.c:464
++#: nih/option.c:462
+ #, c-format
+ msgid "%s: missing argument: %s\n"
+ msgstr "%s : argument manquant : %s\n"
+ 
+-#: nih/option.c:664
++#: nih/option.c:660
+ #, fuzzy, c-format
+ msgid "%s: illegal argument: %s\n"
+ msgstr "%s : argument manquant : %s\n"
+ 
+-#: nih/option.c:862
++#: nih/option.c:858
+ msgid "Usage"
+ msgstr "Utilisation"
+ 
+-#: nih/option.c:866
++#: nih/option.c:862
+ msgid "[OPTION]..."
+ msgstr ""
+ 
+-#: nih/option.c:915
++#: nih/option.c:911
+ #, c-format
+ msgid "Report bugs to <%s>\n"
+ msgstr "Signalez les anomalies à <%s>\n"
+ 
+-#: nih/option.c:941
++#: nih/option.c:937
+ #, c-format
+ msgid "%s options:\n"
+ msgstr "%s options:\n"
+ 
+-#: nih/option.c:943
++#: nih/option.c:939
+ #, c-format
+ msgid "Other options:\n"
+ msgstr "Autres options:\n"
+ 
+-#: nih/option.c:945
++#: nih/option.c:941
+ #, c-format
+ msgid "Options:\n"
+ msgstr "Options:\n"
+ 
+-#: nih/watch.c:521
++#: nih/watch.c:560
+ #, fuzzy
+ msgid "Unable to watch directory"
+ msgstr "Impossible d'accepter la connexion : %s"
+@@ -315,82 +315,92 @@ msgstr "Impossible d'accepter la connexi
+ msgid "Deleting %s job"
+ msgstr "Ré-éxecution de %s"
+ 
+-#: init/control.c:216
++#: init/control.c:225
+ #, fuzzy, c-format
+ msgid "Error on control socket: %s"
+ msgstr "Erreur lors de la lecture du message de contrôle : %s"
+ 
+-#: init/control.c:336
++#: init/control.c:345
++#, fuzzy
++msgid "Control request to change tty"
++msgstr "Demande de contrôle à commencer %s"
++
++#: init/control.c:379
++#, fuzzy
++msgid "Control request to revert changed tty"
++msgstr "Demande de contrôle à commencer %s"
++
++#: init/control.c:413
+ #, fuzzy
+ msgid "Control request for our version"
+ msgstr "Demande de contrôle pour lister les tâches"
+ 
+-#: init/control.c:369
++#: init/control.c:446
+ #, fuzzy
+ msgid "Control request to change logging priority"
+ msgstr "Demande de contrôle à commencer %s"
+ 
+-#: init/control.c:406
++#: init/control.c:483
+ #, fuzzy, c-format
+ msgid "Control request for jobs matching %s"
+ msgstr "Demande de contrôle de status pour %s"
+ 
+-#: init/control.c:408
++#: init/control.c:485
+ #, fuzzy
+ msgid "Control request for all jobs"
+ msgstr "Demande de contrôle pour lister les tâches"
+ 
+-#: init/control.c:470
++#: init/control.c:547
+ #, fuzzy, c-format
+ msgid "Control request for status of %s"
+ msgstr "Demande de contrôle de status pour %s"
+ 
+-#: init/control.c:474
++#: init/control.c:551
+ #, fuzzy, c-format
+ msgid "Control request for status of job #%u"
+ msgstr "Demande de contrôle de status pour %s"
+ 
+-#: init/control.c:528
++#: init/control.c:605
+ #, fuzzy, c-format
+ msgid "Control request to start %s"
+ msgstr "Demande de contrôle à commencer %s"
+ 
+-#: init/control.c:532
++#: init/control.c:609
+ #, fuzzy, c-format
+ msgid "Control request to start job #%u"
+ msgstr "Demande de contrôle à commencer %s"
+ 
+-#: init/control.c:615
++#: init/control.c:692
+ #, fuzzy, c-format
+ msgid "Control request to stop %s"
+ msgstr "Demande de contrôle pour arreter %s"
+ 
+-#: init/control.c:619
++#: init/control.c:696
+ #, fuzzy, c-format
+ msgid "Control request to stop job #%u"
+ msgstr "Demande de contrôle pour arreter %s"
+ 
+-#: init/control.c:748
++#: init/control.c:825
+ #, fuzzy, c-format
+ msgid "Control request to emit %s event"
+ msgstr "Demande de contrôle pour faire la queue des évènements %s"
+ 
+-#: init/control.c:779
++#: init/control.c:856
+ #, fuzzy, c-format
+ msgid "Control request to subscribe %d to jobs"
+ msgstr "Demande de contrôle pour inscrire %d aux tâches"
+ 
+-#: init/control.c:810
++#: init/control.c:887
+ #, fuzzy, c-format
+ msgid "Control request to unsubscribe %d from jobs"
+ msgstr "Demande de contrôle pour désinscrire % des tâches"
+ 
+-#: init/control.c:840
++#: init/control.c:917
+ #, fuzzy, c-format
+ msgid "Control request to subscribe %d to events"
+ msgstr "Demande de contrôle pour inscrire %d aux évènements"
+ 
+-#: init/control.c:871
++#: init/control.c:948
+ #, fuzzy, c-format
+ msgid "Control request to unsubscribe %d from events"
+ msgstr "Demande de contrôle pour désinscrire %d des évènements"
+@@ -496,7 +506,7 @@ msgid ""
+ "actually run /sbin/telinit."
+ msgstr ""
+ 
+-#: init/main.c:136 util/initctl.c:366 compat/sysv/reboot.c:203
++#: init/main.c:136 util/initctl.c:373 compat/sysv/reboot.c:203
+ #: compat/sysv/shutdown.c:322 compat/sysv/telinit.c:91
+ #, fuzzy
+ msgid "Need to be root"
+@@ -672,6 +682,11 @@ msgstr "%s : option invalide : --%s\n"
+ msgid "%s: missing job name\n"
+ msgstr ""
+ 
++#: util/initctl.c:1889
++#, fuzzy, c-format
++msgid "%s: missing device name\n"
++msgstr "%s: argument manquant : %s\n"
++
+ #: util/initctl.c:1826
+ #, c-format
+ msgid "%s: missing event name\n"
+@@ -748,11 +763,11 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2119
++#: util/initctl.c:2239
+ msgid "Stop jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2120
++#: util/initctl.c:2240
+ msgid ""
+ "JOB is one or more job names that are to be stopped.\n"
+ "\n"
+@@ -760,11 +775,11 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2126
++#: util/initctl.c:2246
+ msgid "Query status of jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2127
++#: util/initctl.c:2247
+ msgid ""
+ "JOB is one or more job names that are to be queried.\n"
+ "\n"
+@@ -772,19 +787,19 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2133
++#: util/initctl.c:2253
+ msgid "List known jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2137
++#: util/initctl.c:2257
+ msgid "EVENT [ARG]..."
+ msgstr ""
+ 
+-#: util/initctl.c:2138
++#: util/initctl.c:2258
+ msgid "Emit an event."
+ msgstr ""
+ 
+-#: util/initctl.c:2139
++#: util/initctl.c:2259
+ msgid ""
+ "EVENT is the name of an event the init daemon should emit, which may have "
+ "zero or more arguments specified by ARG.  These may be matched in the job "
+@@ -795,27 +810,35 @@ msgid ""
+ "taken from the environment or ignored if not present there."
+ msgstr ""
+ 
+-#: util/initctl.c:2150
++#: util/initctl.c:2270
+ msgid "Receive notification of job state changes."
+ msgstr ""
+ 
+-#: util/initctl.c:2155
++#: util/initctl.c:2275
+ msgid "Receive notification of emitted events."
+ msgstr ""
+ 
+-#: util/initctl.c:2160
++#: util/initctl.c:2280
++msgid "Change the init daemon's tty device"
++msgstr ""
++
++#: util/initctl.c:2285
++msgid "Revert the last change to the init daemon's tty device"
++msgstr ""
++
++#: util/initctl.c:2290
+ msgid "Request the version of the init daemon."
+ msgstr ""
+ 
+-#: util/initctl.c:2163
++#: util/initctl.c:2293
+ msgid "PRIORITY"
+ msgstr ""
+ 
+-#: util/initctl.c:2164
++#: util/initctl.c:2294
+ msgid "Change the minimum priority of log messages from the init daemon"
+ msgstr ""
+ 
+-#: util/initctl.c:2166
++#: util/initctl.c:2296
+ msgid ""
+ "PRIORITY may be one of `debug' (messages useful for debugging upstart are "
+ "logged, equivalent to --debug on kernel command-line); `info' (messages "
+diff -up po/sv.po.old po/sv.po
+--- po/sv.po.old	2009-06-22 13:45:48.000000000 +0200
++++ po/sv.po	2009-06-22 13:45:48.000000000 +0200
+@@ -21,46 +21,46 @@ msgstr ""
+ msgid "display list of commands"
+ msgstr ""
+ 
+-#: nih/command.c:141
++#: nih/command.c:139
+ #, c-format
+ msgid "For a list of commands, try `%s help'."
+ msgstr ""
+ 
+-#: nih/command.c:144
++#: nih/command.c:142
+ msgid "COMMAND [OPTION]... [ARG]..."
+ msgstr ""
+ 
+-#: nih/command.c:162
++#: nih/command.c:160
+ #, c-format
+ msgid "%s: missing command\n"
+ msgstr ""
+ 
+-#: nih/command.c:170
++#: nih/command.c:168
+ #, c-format
+ msgid "%s: invalid command: %s\n"
+ msgstr ""
+ 
+-#: nih/command.c:181
++#: nih/command.c:179
+ #, c-format
+ msgid "%s [OPTION]..."
+ msgstr ""
+ 
+-#: nih/command.c:424
++#: nih/command.c:418
+ #, c-format
+ msgid "For more information on a command, try `%s COMMAND --help'.\n"
+ msgstr ""
+ 
+-#: nih/command.c:450
++#: nih/command.c:444
+ #, c-format
+ msgid "%s commands:\n"
+ msgstr ""
+ 
+-#: nih/command.c:452
++#: nih/command.c:446
+ #, c-format
+ msgid "Other commands:\n"
+ msgstr ""
+ 
+-#: nih/command.c:454
++#: nih/command.c:448
+ #, c-format
+ msgid "Commands:\n"
+ msgstr ""
+@@ -69,7 +69,7 @@ msgstr ""
+ msgid "Unhandled Error"
+ msgstr ""
+ 
+-#: nih/io.c:1203
++#: nih/io.c:1198
+ msgid "Error while reading from descriptor"
+ msgstr ""
+ 
+@@ -100,60 +100,60 @@ msgstr ""
+ msgid "output version information and exit"
+ msgstr ""
+ 
+-#: nih/option.c:299
++#: nih/option.c:297
+ #, c-format
+ msgid "%s: invalid option: -%c\n"
+ msgstr ""
+ 
+-#: nih/option.c:392
++#: nih/option.c:390
+ #, c-format
+ msgid "%s: invalid option: --%s\n"
+ msgstr ""
+ 
+-#: nih/option.c:408
++#: nih/option.c:406
+ #, c-format
+ msgid "%s: unexpected argument: --%s\n"
+ msgstr ""
+ 
+-#: nih/option.c:464
++#: nih/option.c:462
+ #, c-format
+ msgid "%s: missing argument: %s\n"
+ msgstr ""
+ 
+-#: nih/option.c:664
++#: nih/option.c:660
+ #, c-format
+ msgid "%s: illegal argument: %s\n"
+ msgstr ""
+ 
+-#: nih/option.c:862
++#: nih/option.c:858
+ msgid "Usage"
+ msgstr ""
+ 
+-#: nih/option.c:866
++#: nih/option.c:862
+ msgid "[OPTION]..."
+ msgstr ""
+ 
+-#: nih/option.c:915
++#: nih/option.c:911
+ #, c-format
+ msgid "Report bugs to <%s>\n"
+ msgstr ""
+ 
+-#: nih/option.c:941
++#: nih/option.c:937
+ #, c-format
+ msgid "%s options:\n"
+ msgstr ""
+ 
+-#: nih/option.c:943
++#: nih/option.c:939
+ #, c-format
+ msgid "Other options:\n"
+ msgstr ""
+ 
+-#: nih/option.c:945
++#: nih/option.c:941
+ #, c-format
+ msgid "Options:\n"
+ msgstr ""
+ 
+-#: nih/watch.c:521
++#: nih/watch.c:560
+ msgid "Unable to watch directory"
+ msgstr ""
+ 
+@@ -295,79 +295,87 @@ msgstr ""
+ msgid "Deleting %s job"
+ msgstr ""
+ 
+-#: init/control.c:216
++#: init/control.c:225
+ #, c-format
+ msgid "Error on control socket: %s"
+ msgstr ""
+ 
+-#: init/control.c:336
++#: init/control.c:345
++msgid "Control request to change tty"
++msgstr ""
++
++#: init/control.c:379
++msgid "Control request to revert changed tty"
++msgstr ""
++
++#: init/control.c:413
+ msgid "Control request for our version"
+ msgstr ""
+ 
+-#: init/control.c:369
++#: init/control.c:446
+ msgid "Control request to change logging priority"
+ msgstr ""
+ 
+-#: init/control.c:406
++#: init/control.c:483
+ #, c-format
+ msgid "Control request for jobs matching %s"
+ msgstr ""
+ 
+-#: init/control.c:408
++#: init/control.c:485
+ msgid "Control request for all jobs"
+ msgstr ""
+ 
+-#: init/control.c:470
++#: init/control.c:547
+ #, c-format
+ msgid "Control request for status of %s"
+ msgstr ""
+ 
+-#: init/control.c:474
++#: init/control.c:551
+ #, c-format
+ msgid "Control request for status of job #%u"
+ msgstr ""
+ 
+-#: init/control.c:528
++#: init/control.c:605
+ #, c-format
+ msgid "Control request to start %s"
+ msgstr ""
+ 
+-#: init/control.c:532
++#: init/control.c:609
+ #, c-format
+ msgid "Control request to start job #%u"
+ msgstr ""
+ 
+-#: init/control.c:615
++#: init/control.c:692
+ #, c-format
+ msgid "Control request to stop %s"
+ msgstr ""
+ 
+-#: init/control.c:619
++#: init/control.c:696
+ #, c-format
+ msgid "Control request to stop job #%u"
+ msgstr ""
+ 
+-#: init/control.c:748
++#: init/control.c:825
+ #, c-format
+ msgid "Control request to emit %s event"
+ msgstr ""
+ 
+-#: init/control.c:779
++#: init/control.c:856
+ #, c-format
+ msgid "Control request to subscribe %d to jobs"
+ msgstr ""
+ 
+-#: init/control.c:810
++#: init/control.c:887
+ #, c-format
+ msgid "Control request to unsubscribe %d from jobs"
+ msgstr ""
+ 
+-#: init/control.c:840
++#: init/control.c:917
+ #, c-format
+ msgid "Control request to subscribe %d to events"
+ msgstr ""
+ 
+-#: init/control.c:871
++#: init/control.c:948
+ #, c-format
+ msgid "Control request to unsubscribe %d from events"
+ msgstr ""
+@@ -472,7 +480,7 @@ msgid ""
+ "actually run /sbin/telinit."
+ msgstr ""
+ 
+-#: init/main.c:136 util/initctl.c:366 compat/sysv/reboot.c:203
++#: init/main.c:136 util/initctl.c:373 compat/sysv/reboot.c:203
+ #: compat/sysv/shutdown.c:322 compat/sysv/telinit.c:91
+ msgid "Need to be root"
+ msgstr ""
+@@ -642,6 +650,11 @@ msgstr ""
+ msgid "%s: missing job name\n"
+ msgstr ""
+ 
++#: util/initctl.c:1889
++#, fuzzy, c-format
++msgid "%s: missing device name\n"
++msgstr ""
++
+ #: util/initctl.c:1826
+ #, c-format
+ msgid "%s: missing event name\n"
+@@ -718,11 +731,11 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2119
++#: util/initctl.c:2239
+ msgid "Stop jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2120
++#: util/initctl.c:2240
+ msgid ""
+ "JOB is one or more job names that are to be stopped.\n"
+ "\n"
+@@ -730,11 +743,11 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2126
++#: util/initctl.c:2246
+ msgid "Query status of jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2127
++#: util/initctl.c:2247
+ msgid ""
+ "JOB is one or more job names that are to be queried.\n"
+ "\n"
+@@ -742,19 +755,19 @@ msgid ""
+ "uniquely identifying a particular instance of a job."
+ msgstr ""
+ 
+-#: util/initctl.c:2133
++#: util/initctl.c:2253
+ msgid "List known jobs."
+ msgstr ""
+ 
+-#: util/initctl.c:2137
++#: util/initctl.c:2257
+ msgid "EVENT [ARG]..."
+ msgstr ""
+ 
+-#: util/initctl.c:2138
++#: util/initctl.c:2258
+ msgid "Emit an event."
+ msgstr ""
+ 
+-#: util/initctl.c:2139
++#: util/initctl.c:2259
+ msgid ""
+ "EVENT is the name of an event the init daemon should emit, which may have "
+ "zero or more arguments specified by ARG.  These may be matched in the job "
+@@ -765,27 +778,35 @@ msgid ""
+ "taken from the environment or ignored if not present there."
+ msgstr ""
+ 
+-#: util/initctl.c:2150
++#: util/initctl.c:2270
+ msgid "Receive notification of job state changes."
+ msgstr ""
+ 
+-#: util/initctl.c:2155
++#: util/initctl.c:2275
+ msgid "Receive notification of emitted events."
+ msgstr ""
+ 
+-#: util/initctl.c:2160
++#: util/initctl.c:2280
++msgid "Change the init daemon's tty device"
++msgstr ""
++
++#: util/initctl.c:2285
++msgid "Revert the last change to the init daemon's tty device"
++msgstr ""
++
++#: util/initctl.c:2290
+ msgid "Request the version of the init daemon."
+ msgstr ""
+ 
+-#: util/initctl.c:2163
++#: util/initctl.c:2293
+ msgid "PRIORITY"
+ msgstr ""
+ 
+-#: util/initctl.c:2164
++#: util/initctl.c:2294
+ msgid "Change the minimum priority of log messages from the init daemon"
+ msgstr ""
+ 
+-#: util/initctl.c:2166
++#: util/initctl.c:2296
+ msgid ""
+ "PRIORITY may be one of `debug' (messages useful for debugging upstart are "
+ "logged, equivalent to --debug on kernel command-line); `info' (messages "
+diff -up upstart/message.c.old upstart/message.c
+--- upstart/message.c.old	2009-06-22 13:45:48.000000000 +0200
++++ upstart/message.c	2009-06-22 13:45:48.000000000 +0200
+@@ -261,6 +261,20 @@ upstart_message_newv (const void        
+ 		break;
+ 	case UPSTART_VERSION_QUERY:
+ 		break;
++	case UPSTART_POP_TTY:
++		break;
++	case UPSTART_TTY:
++		if (upstart_push_packv (message, "s", args_copy))
++			goto error;
++
++		break;
++
++	case UPSTART_PUSH_TTY:
++		if (upstart_push_packv (message, "s", args_copy))
++			goto error;
++
++		break;
++
+ 	case UPSTART_LOG_PRIORITY:
+ 		if (upstart_push_packv (message, "u", args_copy))
+ 			goto error;
+@@ -550,6 +564,9 @@ upstart_message_handle (const void     *
+ 	case UPSTART_VERSION_QUERY:
+ 		ret = handler (data, cred.pid, type);
+ 		break;
++	case UPSTART_POP_TTY:
++		ret = handler (data, cred.pid, type);
++		break;
+ 	case UPSTART_LOG_PRIORITY: {
+ 		NihLogLevel priority;
+ 
+@@ -559,6 +576,41 @@ upstart_message_handle (const void     *
+ 		ret = handler (data, cred.pid, type, priority);
+ 		break;
+ 	}
++
++	case UPSTART_PUSH_TTY: {
++		char *tty = NULL;
++
++		if (upstart_pop_pack (message, parent, "s", &tty)) {
++			if (tty)
++				nih_free (tty);
++
++			goto invalid;
++		}
++
++		if (! tty)
++			goto invalid;
++
++		ret = handler (data, cred.pid, type, tty);
++		break;
++	}
++
++	case UPSTART_TTY: {
++		char *tty = NULL;
++
++		if (upstart_pop_pack (message, parent, "s", &tty)) {
++			if (tty)
++				nih_free (tty);
++
++			goto invalid;
++		}
++
++		if (! tty)
++			goto invalid;
++
++		ret = handler (data, cred.pid, type, tty);
++		break;
++	}
++
+ 	case UPSTART_VERSION: {
+ 		char *version = NULL;
+ 
+diff -up upstart/message.h.old upstart/message.h
+--- upstart/message.h.old	2009-06-22 13:45:48.000000000 +0200
++++ upstart/message.h	2009-06-22 13:45:48.000000000 +0200
+@@ -57,11 +57,20 @@ typedef enum upstart_message_type {
+ 	 * UPSTART_VERSION message in reply.
+ 	 *
+ 	 * Clients may send UPSTART_LOG_PRIORITY, without any reply.
++	 *
++	 * Clients may send UPSTART_PUSH_TTY and recieve an UPSTART_TTY message
++	 * in reply
++	 *
++	 * Clients may send UPSTART_POP_TTY and recieve an UPSTART_TTY message
++	 * in reply
+ 	 */
+ 	UPSTART_NO_OP              = 0x0000,
+ 	UPSTART_VERSION_QUERY      = 0x0001,
+ 	UPSTART_LOG_PRIORITY       = 0x0002,
+ 	UPSTART_VERSION            = 0x0010,
++	UPSTART_PUSH_TTY           = 0x0011,
++	UPSTART_POP_TTY            = 0x0012,
++	UPSTART_TTY                = 0x0013,
+ 
+ 	/* Job requests and responses.
+ 	 *
+diff -up util/initctl.c.old util/initctl.c
+--- util/initctl.c.old	2009-06-22 13:45:48.000000000 +0200
++++ util/initctl.c	2009-06-22 13:45:48.000000000 +0200
+@@ -99,6 +99,9 @@ static void  job_info_output (const JobI
+ static char *output_name     (unsigned int id, const char *name);
+ 
+ /* Prototypes of response handler functions */
++static int handle_tty              (void *data, pid_t pid,
++				    UpstartMessageType type,
++				    const char *tty);
+ static int handle_version          (void *data, pid_t pid,
+ 				    UpstartMessageType type,
+ 				    const char *version);
+@@ -159,6 +162,8 @@ static int  handle_unknown_message (void
+ 
+ /* Prototypes for option and command functions */
+ int env_option          (NihOption *option, const char *arg);
++int push_tty_action     (NihCommand *command, char * const *args);
++int pop_tty_action      (NihCommand *command, char * const *args);
+ int start_action        (NihCommand *command, char * const *args);
+ int stop_action         (NihCommand *command, char * const *args);
+ int status_action       (NihCommand *command, char * const *args);
+@@ -296,6 +301,8 @@ static UpstartMessage handlers[] = {
+ 	{ -1, UPSTART_VERSION,
+ 	  (UpstartMessageHandler)handle_version },
+ 
++	{ -1, UPSTART_TTY,
++	  (UpstartMessageHandler)handle_tty },
+ 	{ -1, UPSTART_JOB,
+ 	  (UpstartMessageHandler)handle_job },
+ 	{ -1, UPSTART_JOB_FINISHED,
+@@ -687,6 +694,40 @@ handle_version (void               *data
+ }
+ 
+ /**
++ * handle_tty:
++ * @data: data passed to handler,
++ * @pid: origin of message,
++ * @type: message type,
++ * @version: tty device in use.
++ *
++ * Handles receipt of the UPSTART_TTY reply from the server, which is
++ * sent in response to an UPSTART_PUSH_TTY or UPSTART_POP_TTY message.
++ *
++ * Output the version string received and mark it as a response.
++ *
++ * Returns: zero on success, negative value on error or positive value if the
++ * command should exit with that exit status.
++ **/
++static int
++handle_tty (void               *data,
++	    pid_t               pid,
++	    UpstartMessageType  type,
++	    const char         *tty)
++{
++	nih_assert (pid > 0);
++	nih_assert (type == UPSTART_TTY);
++	nih_assert (tty != NULL);
++
++	if (! event_caused)
++		num_responses++;
++
++	event_caused = FALSE;
++
++	nih_message ("%s", tty);
++
++	return 0;
++}
++/**
+  * handle_job:
+  * @data: data passed to handler,
+  * @pid: origin of message,
+@@ -1802,6 +1843,61 @@ list_action (NihCommand   *command,
+ }
+ 
+ /**
++ * pop_tty_action:
++ * @command: NihCommand invoked,
++ * @args: command-line arguments.
++ *
++ * This function is called for the "pop_tty" command; it takes no arguments.
++ *
++ * It reverts the last push_tty command, and replies with the new tty.
++ *
++ * Returns: command exit status.
++ **/
++int
++pop_tty_action (NihCommand   *command,
++	         char * const *args)
++{
++	nih_assert (command != NULL);
++	nih_assert (args != NULL);
++
++	if (initctl_send (UPSTART_POP_TTY) < 0)
++		return 1;
++
++	return initctl_recv (1);
++}
++
++/**
++ * push_tty_action:
++ * @command: NihCommand invoked,
++ * @args: command-line arguments.
++ *
++ * This function is called for the "push_tty" command; it takes a tty device
++ * name.
++ *
++ * It causes upstart to begin using that tty, and replies with the new tty.
++ *
++ * Returns: command exit status.
++ **/
++int
++push_tty_action (NihCommand   *command,
++	         char * const *args)
++{
++	nih_assert (command != NULL);
++	nih_assert (args != NULL);
++
++	if (! args[0]) {
++		fprintf (stderr, _("%s: missing device name\n"), program_name);
++		nih_main_suggest_help ();
++		return 1;
++	}
++
++	if (initctl_send (UPSTART_PUSH_TTY, args[0]) < 0)
++		return 1;
++
++	return initctl_recv (1);
++}
++
++/**
+  * emit_action:
+  * @command: NihCommand invoked,
+  * @args: command-line arguments.
+@@ -2079,6 +2175,24 @@ NihOption version_options[] = {
+ };
+ 
+ /**
++ * pop_tty_options:
++ *
++ * Command-line options accepted for the pop_tty command.
++ **/
++NihOption pop_tty_options[] = {
++	NIH_OPTION_LAST
++};
++
++/**
++ * push_tty_options:
++ *
++ * Command-line options accepted for the push_tty command.
++ **/
++NihOption push_tty_options[] = {
++	NIH_OPTION_LAST
++};
++
++/**
+  * log_priority_options:
+  *
+  * Command-line options accepted for the log-priority command.
+@@ -2156,6 +2270,16 @@ static NihCommand commands[] = {
+ 	  NULL,
+ 	  &event_commands, events_options, events_action },
+ 
++	{ "push-tty", NULL,
++	  N_("Change the init daemon's tty device"),
++	  NULL,
++	  NULL, push_tty_options, push_tty_action },
++
++	{ "pop-tty", NULL,
++	  N_("Revert the last change to the init daemon's tty device"),
++	  NULL,
++	  NULL, pop_tty_options, pop_tty_action },
++
+ 	{ "version", NULL,
+ 	  N_("Request the version of the init daemon."),
+ 	  NULL,
diff --git a/upstart.spec b/upstart.spec
new file mode 100644
index 0000000..fe0e618
--- /dev/null
+++ b/upstart.spec
@@ -0,0 +1,175 @@
+Name:           upstart
+Version:        0.3.11
+Release:        1%{?dist}
+Summary:        An event-driven init system
+
+Group:          System Environment/Base
+License:        GPLv2+
+URL:            http://upstart.ubuntu.com
+Source0:        http://upstart.ubuntu.com/download/0.3/upstart-%{version}.tar.bz2
+Source1:	events.5
+Patch0:         upstart-force-on-shutdown-reboot.patch
+Patch1:         upstart-tty-stack.patch
+Patch2:         upstart-fedora-buglist.patch
+Patch3:         upstart-telinit-u.patch
+Patch4:	        upstart-initctl-man.patch
+Patch5:		upstart-save-state-across-reexec.patch
+Patch6:		upstart-audit-events.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
+Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
+BuildRequires:  gettext audit-libs-devel
+
+%description
+Upstart is an event-based replacement for the /sbin/init daemon which
+handles starting of tasks and services during boot, stopping them
+during shutdown and supervising them while the system is running.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+%build
+%configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+mkdir -p %{buildroot}/%{_mandir}/man5
+install -m 644 %{SOURCE1} %{buildroot}/%{_mandir}/man5/events.5
+
+# libupstart and libnih aren't shipped
+rm -f %{buildroot}/%{_lib}/libupstart.*
+rm -f %{buildroot}/%{_lib}/libnih.*
+rm -f %{buildroot}/%{_includedir}/libnih.h
+rm -f %{buildroot}/%{_includedir}/libupstart.h
+rm -rf %{buildroot}/%{_includedir}/nih
+rm -rf %{buildroot}/%{_includedir}/upstart
+rm -rf %{buildroot}/%{_datadir}/aclocal/compiler.m4
+rm -rf %{buildroot}/%{_datadir}/aclocal/linker.m4
+rm -rf %{buildroot}/%{_datadir}/aclocal/misc.m4
+
+%find_lang %{name}
+
+%clean
+rm -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS
+%doc COPYING
+%doc NEWS
+%doc README
+%doc TODO
+%doc HACKING
+%{_sysconfdir}/event.d/
+%config(noreplace) %{_sysconfdir}/event.d/logd
+/sbin/halt
+/sbin/init
+/sbin/initctl
+/sbin/logd
+/sbin/poweroff
+/sbin/reboot
+/sbin/runlevel
+/sbin/shutdown
+/sbin/start
+/sbin/status
+/sbin/stop
+/sbin/telinit
+%{_mandir}/man5/events.5.gz
+%{_mandir}/man8/halt.8.gz
+%{_mandir}/man8/init.8.gz
+%{_mandir}/man8/initctl.8.gz
+%{_mandir}/man8/logd.8.gz
+%{_mandir}/man8/poweroff.8.gz
+%{_mandir}/man8/reboot.8.gz
+%{_mandir}/man8/runlevel.8.gz
+%{_mandir}/man8/shutdown.8.gz
+%{_mandir}/man8/start.8.gz
+%{_mandir}/man8/status.8.gz
+%{_mandir}/man8/stop.8.gz
+%{_mandir}/man8/telinit.8.gz
+
+%changelog
+* Wed Jul 22 2009 Petr Lautrbach <plautrba@redhat.com> - 0.3.11-1
+- Update to 0.3.11
+
+* Mon Apr 27 2009 Bill Nottingham <notting@redhat.com> - 0.3.9-24
+- Apply the audit patch correctly (#470661)
+
+* Fri Apr 3 2009 Casey Dahlin <cdahlin@redhat.com> - 0.3.9-23
+- Add audit events patch from Steve Grubb <sgrubb@redhat.com> (Bug #470661)
+
+* Fri Jan 23 2009 Casey Dahlin <cdahlin@redhat.com> - 0.3.9-22
+- Re-add 'telinit u' support along with patch to fix it (#450488). Patch due to
+  <pspencer@fields.utoronto.ca>
+
+* Mon Jan 12 2009 Bill Nottingham <notting@redhat.com> - 0.3.9-21
+- Remove 'telinit u' support as it is broken (#450488, <cjdahlin@ncsu.edu>)
+
+* Fri Apr 25 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-19
+- with the merge of event-compat-sysv, move the sysvinit obsoletes/provides here
+
+* Thu Apr 24 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-18
+- fix some man page typos (#444008, <archimerged@gmail.com>)
+
+* Wed Apr 09 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-17
+- Added list of stock events to events(5)
+
+* Tue Apr 08 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-16
+- Add telinit u support
+
+* Fri Apr 04 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-15
+- Add a events(5) manpage that describes event syntax
+
+* Thu Apr 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-14
+- Change bug report email address to fedora-devel-list@redhat.com
+
+* Thu Mar 14 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-13
+- Ignore rpm temporary files of the foo;<somehex> format
+- Make ignores of .rpm{new,orig,save} match only at the end of the name
+
+* Wed Mar 13 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-12
+- forgot about rpmorig too (ugh)
+
+* Wed Mar 13 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-11
+- Make logd a noreplace
+
+* Wed Mar 13 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-10
+- Add patch to ignore .rpm{new,save} files
+
+* Sun Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-9
+- Remove automake dependency, build Makefile.in changes into patch
+
+* Sun Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-8
+- Run automake after patching
+
+* Sun Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-7
+- Added BuildRequires: automake
+
+* Sun Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-6
+- Added patch to allow runtime tty changes
+
+* Fri Feb 15 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-5
+- Added patch to imply --force on runlevels 0 and 6
+
+* Wed Feb 06 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-4
+- Patched for GCC 4.3
+
+* Thu Jan 31 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-3
+- Added AUTHORS, COPYING, etc.
+- Made config --libdir option relative
+
+* Mon Jan 21 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-2
+- Remove libnih and libupstart
+
+* Sun Jan 13 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-1
+- Initial packaging