Merge lp:~jamesodhunt/upstart/upstream-change-startup-event into lp:upstart

[James Hunt]

Add ability to suppress initial event and/or change its name.

* init/main.c: New command-line options: "--no-startup-event" and
  "--startup-event". If "--no-startup-event" specified, log message as a
  debug aid.
* init/man/init.8: Documentation for new command-line options:
  "--no-startup-event" and "--startup-event".

=== modified file 'ChangeLog'
--- ChangeLog	2011-05-12 20:42:28 +0000
+++ ChangeLog	2011-06-03 09:26:24 +0000
@@ -1,3 +1,37 @@
[phone]  James Hunt  <[e-mail]>
+
+	Add command-line option to use D-Bus session bus (for testing).
+	
+	* init/control.c:
+	  - Added new boolean use_session_bus.
+	  - Updated comments.
+	  - control_handle_bus_type(): New function to allow selection of
+	    session bus via env var "UPSTART_USE_SESSION_BUS".
+	    Also logs use of session bus if use_session_bus set.
+	  - control_bus_open(): Now connects to either D-Bus system bus or session bus.
+	* init/control.h: New define for USE_SESSION_BUS_ENV.
+	* init/main.c: Addition of "--session" command-line option.
+	* init/man/init.8: Update for new "--session" command-line option.
+
+	* Corrected copyright notices.
+
+	Add option to allow alternate location for job config files.
+	
+	* init/main.c:
+	  - Added "--confdir <dir>" command-line option.
+	  - handle_confdir(): New function to select alternate confdir using env
+	    var "UPSTART_CONFDIR" or command-line option (for testing).
+	* init/paths.h: Added define for CONFDIR_ENV.
+	* init/man/init.8: Update for new "--confdir" command-line option.
+
+	Add ability to suppress initial event and/or change its name.
+	
+	* init/main.c: New command-line options: "--no-startup-event" and
+	  "--startup-event". If "--no-startup-event" specified, log message as a
+	  debug aid.
+	* init/man/init.8: Documentation for new command-line options:
+	  "--no-startup-event" and "--startup-event".
+
 2011-05-12  Marc - A. Dahlhaus  <[e-mail]>
 
 	* init/job_class.h (JobClass): Add kill signal member

=== modified file 'configure.ac'
--- configure.ac	2011-03-22 17:53:17 +0000
+++ configure.ac	2011-06-03 09:26:24 +0000
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT([upstart], [1.3], [[e-mail]])
-NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Google Inc., Canonical Ltd.]])
+NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Canonical Ltd.]])
 AC_CONFIG_SRCDIR([init/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 

=== modified file 'init/conf.c'
--- init/conf.c	2011-03-15 18:44:09 +0000
+++ init/conf.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,6 @@
  *
  * conf.c - configuration management
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/control.c'
--- init/control.c	2009-07-11 11:47:12 +0000
+++ init/control.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,7 @@
  *
  * control.c - D-Bus connections, objects and methods
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -54,12 +54,19 @@
 
 #include "com.ubuntu.Upstart.h"
 
-
 /* Prototypes for static functions */
 static int   control_server_connect (DBusServer *server, DBusConnection *conn);
 static void  control_disconnected   (DBusConnection *conn);
 static void  control_register_all   (DBusConnection *conn);
 
+/**
+ * use_session_bus:
+ *
+ * If TRUE, connect to the D-Bus sessio bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+int use_session_bus = FALSE;
 
 /**
  * control_server_address:
@@ -78,7 +85,7 @@
 /**
  * control_bus:
  *
- * Open connection to D-Bus system bus.  The connection may be opened with
+ * Open connection to a D-Bus bus.  The connection may be opened with
  * control_bus_open() and if lost will become NULL.
  **/
 DBusConnection *control_bus = NULL;
@@ -86,7 +93,7 @@
 /**
  * control_conns:
  *
- * Open control connections, including the connection to the D-Bus system
+ * Open control connections, including the connection to a D-Bus
  * bus and any private client connections.
  **/
 NihList *control_conns = NULL;
@@ -190,8 +197,9 @@
 /**
  * control_bus_open:
  *
- * Open a connection to the D-Bus system bus and store it in the control_bus
- * global.  The connection is handled automatically in the main loop.
+ * Open a connection to the appropriate D-Bus bus and store it in the
+ * control_bus global. The connection is handled automatically
+ * in the main loop.
  *
  * Returns: zero on success, negative value on raised error.
  **/
@@ -207,10 +215,13 @@
 
 	control_init ();
 
+	control_handle_bus_type ();
+
 	/* Connect to the D-Bus System Bus and hook everything up into
 	 * our own main loop automatically.
 	 */
-	conn = nih_dbus_bus (DBUS_BUS_SYSTEM, control_disconnected);
+	conn = nih_dbus_bus (use_session_bus ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM,
+			     control_disconnected);
 	if (! conn)
 		return -1;
 
@@ -669,3 +680,18 @@
 
 	return 0;
 }
+
+/**
+ * control_handle_bus_type:
+ *
+ * Determine D-Bus bus type to connect to.
+ **/
+void
+control_handle_bus_type (void)
+{
+	if (getenv (USE_SESSION_BUS_ENV))
+		use_session_bus = TRUE;
+
+	if (use_session_bus)
+		nih_debug ("Using session bus");
+}

=== modified file 'init/control.h'
--- init/control.h	2009-07-09 08:36:52 +0000
+++ init/control.h	2011-06-03 09:26:24 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,18 @@
 #include <nih-dbus/dbus_connection.h>
 #include <nih-dbus/dbus_message.h>
 
+/**
+ * USE_SESSION_BUS_ENV:
+ *
+ * If this environment variable is set to any value, connect to
+ * D-Bus session bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+#ifndef USE_SESSION_BUS_ENV
+#define USE_SESSION_BUS_ENV "UPSTART_USE_SESSION_BUS"
+#endif
+
 
 NIH_BEGIN_EXTERN
 
@@ -72,6 +84,8 @@
 				   const char *log_priority)
 	__attribute__ ((warn_unused_result));
 
+void control_handle_bus_type      (void);
+
 NIH_END_EXTERN
 
 #endif /* INIT_CONTROL_H */

=== modified file 'init/environ.c'
--- init/environ.c	2011-03-16 22:42:48 +0000
+++ init/environ.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,6 @@
  *
  * environ.c - environment table utilities
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/environ.h'
--- init/environ.h	2011-03-16 22:42:48 +0000
+++ init/environ.h	2011-06-03 09:26:24 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/job_process.c'
--- init/job_process.c	2011-05-12 20:42:28 +0000
+++ init/job_process.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,6 @@
  *
  * job_process.c - job process handling
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/job_process.h'
--- init/job_process.h	2011-05-12 19:21:16 +0000
+++ init/job_process.h	2011-06-03 09:26:24 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/main.c'
--- init/main.c	2011-03-16 22:54:56 +0000
+++ init/main.c	2011-06-03 09:26:24 +0000
@@ -1,7 +1,6 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -71,6 +70,8 @@
 static void usr1_handler    (void *data, NihSignal *signal);
 #endif /* DEBUG */
 
+static void handle_confdir  (void);
+
 
 /**
  * argv0:
@@ -90,13 +91,49 @@
 
 
 /**
+ * conf_dir:
+ *
+ * Full path to job configuration file directory.
+ *
+ **/
+static char *conf_dir = NULL;
+
+/**
+ * initial_event:
+ *
+ * Alternate event to emit at startup (rather than STARTUP_EVENT).
+ **/
+static char *initial_event = NULL;
+
+/**
+ * disable_startup_event:
+ *
+ * If TRUE, do not emit a startup event.
+ **/
+static int disable_startup_event = FALSE;
+
+extern int use_session_bus;
+
+/**
  * options:
  *
  * Command-line options we accept.
  **/
 static NihOption options[] = {
+	{ 0, "confdir", N_("specify alternative directory to load configuration files from"),
+		NULL, "DIR", &conf_dir, NULL },
+
+	{ 0, "no-startup-event", N_("do not emit any startup event (for testing)"),
+		NULL, NULL, &disable_startup_event, NULL },
+
 	{ 0, "restart", NULL, NULL, NULL, &restart, NULL },
 
+	{ 0, "session", N_("use D-Bus session bus rather than system bus (for testing)"),
+		NULL, NULL, &use_session_bus, NULL },
+
+	{ 0, "startup-event", N_("specify an alternative initial event (for testing)"),
+		NULL, "NAME", &initial_event, NULL },
+
 	/* Ignore invalid options */
 	{ '-', "--", NULL, NULL, NULL, NULL, NULL },
 
@@ -124,94 +161,105 @@
 	if (! args)
 		exit (1);
 
+	handle_confdir ();
+	control_handle_bus_type ();
+
 #ifndef DEBUG
-	/* Check we're root */
-	if (getuid ()) {
-		nih_fatal (_("Need to be root"));
-		exit (1);
-	}
-
-	/* Check we're process #1 */
-	if (getpid () > 1) {
-		execv (TELINIT, argv);
-		/* Ignore failure, probably just that telinit doesn't exist */
-
-		nih_fatal (_("Not being executed as init"));
-		exit (1);
-	}
-
-	/* Clear our arguments from the command-line, so that we show up in
-	 * ps or top output as /sbin/init, with no extra flags.
-	 *
-	 * This is a very Linux-specific trick; by deleting the NULL
-	 * terminator at the end of the last argument, we fool the kernel
-	 * into believing we used a setproctitle()-a-like to extend the
-	 * argument space into the environment space, and thus make it use
-	 * strlen() instead of its own assumed length.  In fact, we've done
-	 * the exact opposite, and shrunk the command line length to just that
-	 * of whatever is in argv[0].
-	 *
-	 * If we don't do this, and just write \0 over the rest of argv, for
-	 * example; the command-line length still includes those \0s, and ps
-	 * will show whitespace in their place.
-	 */
-	if (argc > 1) {
-		char *arg_end;
-
-		arg_end = argv[argc-1] + strlen (argv[argc-1]);
-		*arg_end = ' ';
-	}
-
-
-	/* Become the leader of a new session and process group, shedding
-	 * any controlling tty (which we shouldn't have had anyway - but
-	 * you never know what initramfs did).
-	 */
-	setsid ();
-
-	/* Set the standard file descriptors to the ordinary console device,
-	 * resetting it to sane defaults unless we're inheriting from another
-	 * init process which we know left it in a sane state.
-	 */
-	if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
-		nih_free (nih_error_get ());
-
-	/* Set the PATH environment variable */
-	setenv ("PATH", PATH, TRUE);
-
-	/* Switch to the root directory in case we were started from some
-	 * strange place, or worse, some directory in the initramfs that's
-	 * going to go away soon.
-	 */
-	if (chdir ("/"))
-		nih_warn ("%s: %s", _("Unable to set root directory"),
-			  strerror (errno));
-
-	/* Mount the /proc and /sys filesystems, which are pretty much
-	 * essential for any Linux system; not to mention used by
-	 * ourselves.
-	 */
-	if (system_mount ("proc", "/proc") < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
-			  err->message);
-		nih_free (err);
-	}
-
-	if (system_mount ("sysfs", "/sys") < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
-			  err->message);
-		nih_free (err);
-	}
+	if (use_session_bus == FALSE) {
+
+		/* Check we're root */
+		if (getuid ()) {
+			nih_fatal (_("Need to be root"));
+			exit (1);
+		}
+
+		/* Check we're process #1 */
+		if (getpid () > 1) {
+			execv (TELINIT, argv);
+			/* Ignore failure, probably just that telinit doesn't exist */
+
+			nih_fatal (_("Not being executed as init"));
+			exit (1);
+		}
+
+		/* Clear our arguments from the command-line, so that we show up in
+		 * ps or top output as /sbin/init, with no extra flags.
+		 *
+		 * This is a very Linux-specific trick; by deleting the NULL
+		 * terminator at the end of the last argument, we fool the kernel
+		 * into believing we used a setproctitle()-a-like to extend the
+		 * argument space into the environment space, and thus make it use
+		 * strlen() instead of its own assumed length.  In fact, we've done
+		 * the exact opposite, and shrunk the command line length to just that
+		 * of whatever is in argv[0].
+		 *
+		 * If we don't do this, and just write \0 over the rest of argv, for
+		 * example; the command-line length still includes those \0s, and ps
+		 * will show whitespace in their place.
+		 */
+		if (argc > 1) {
+			char *arg_end;
+
+			arg_end = argv[argc-1] + strlen (argv[argc-1]);
+			*arg_end = ' ';
+		}
+
+
+		/* Become the leader of a new session and process group, shedding
+		 * any controlling tty (which we shouldn't have had anyway - but
+		 * you never know what initramfs did).
+		 */
+		setsid ();
+
+		/* Set the standard file descriptors to the ordinary console device,
+		 * resetting it to sane defaults unless we're inheriting from another
+		 * init process which we know left it in a sane state.
+		 */
+		if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
+			nih_free (nih_error_get ());
+
+		/* Set the PATH environment variable */
+		setenv ("PATH", PATH, TRUE);
+
+		/* Switch to the root directory in case we were started from some
+		 * strange place, or worse, some directory in the initramfs that's
+		 * going to go away soon.
+		 */
+		if (chdir ("/"))
+			nih_warn ("%s: %s", _("Unable to set root directory"),
+				strerror (errno));
+
+		/* Mount the /proc and /sys filesystems, which are pretty much
+		 * essential for any Linux system; not to mention used by
+		 * ourselves.
+		 */
+		if (system_mount ("proc", "/proc") < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
+				err->message);
+			nih_free (err);
+		}
+
+		if (system_mount ("sysfs", "/sys") < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
+				err->message);
+			nih_free (err);
+		}
+	} else {
+		nih_log_set_priority (NIH_LOG_DEBUG);
+		nih_debug ("Running with UID %d as PID %d (PPID %d)",
+				(int)getuid (), (int)getpid (), (int)getppid ());
+	}
+
 #else /* DEBUG */
 	nih_log_set_priority (NIH_LOG_DEBUG);
-	nih_debug ("Running as PID %d (PPID %d)",
-		(int)getpid (), (int)getppid ());
+	nih_debug ("Running with UID %d as PID %d (PPID %d)",
+		(int)getuid (), (int)getpid (), (int)getppid ());
 #endif /* DEBUG */
 
 
@@ -223,11 +271,13 @@
 		nih_signal_reset ();
 
 #ifndef DEBUG
-	/* Catch fatal errors immediately rather than waiting for a new
-	 * iteration through the main loop.
-	 */
-	nih_signal_set_handler (SIGSEGV, crash_handler);
-	nih_signal_set_handler (SIGABRT, crash_handler);
+	if (use_session_bus == FALSE) {
+		/* Catch fatal errors immediately rather than waiting for a new
+		 * iteration through the main loop.
+		 */
+		nih_signal_set_handler (SIGSEGV, crash_handler);
+		nih_signal_set_handler (SIGABRT, crash_handler);
+	}
 #endif /* DEBUG */
 
 	/* Don't ignore SIGCHLD or SIGALRM, but don't respond to them
@@ -238,33 +288,35 @@
 	nih_signal_set_handler (SIGALRM, nih_signal_handler);
 
 #ifndef DEBUG
-	/* Ask the kernel to send us SIGINT when control-alt-delete is
-	 * pressed; generate an event with the same name.
-	 */
-	reboot (RB_DISABLE_CAD);
-	nih_signal_set_handler (SIGINT, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
-
-	/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
-	 * generate a keyboard-request event.
-	 */
-	if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
-		nih_signal_set_handler (SIGWINCH, nih_signal_handler);
-		NIH_MUST (nih_signal_add_handler (NULL, SIGWINCH,
-						  kbd_handler, NULL));
+	if (use_session_bus == FALSE) {
+		/* Ask the kernel to send us SIGINT when control-alt-delete is
+		 * pressed; generate an event with the same name.
+		 */
+		reboot (RB_DISABLE_CAD);
+		nih_signal_set_handler (SIGINT, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
+
+		/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
+		 * generate a keyboard-request event.
+		 */
+		if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
+			nih_signal_set_handler (SIGWINCH, nih_signal_handler);
+			NIH_MUST (nih_signal_add_handler (NULL, SIGWINCH,
+						kbd_handler, NULL));
+		}
+
+		/* powstatd sends us SIGPWR when it changes /etc/powerstatus */
+		nih_signal_set_handler (SIGPWR, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pwr_handler, NULL));
+
+		/* SIGHUP instructs us to re-load our configuration */
+		nih_signal_set_handler (SIGHUP, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGHUP, hup_handler, NULL));
+
+		/* SIGUSR1 instructs us to reconnect to D-Bus */
+		nih_signal_set_handler (SIGUSR1, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
 	}
-
-	/* powstatd sends us SIGPWR when it changes /etc/powerstatus */
-	nih_signal_set_handler (SIGPWR, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pwr_handler, NULL));
-
-	/* SIGHUP instructs us to re-load our configuration */
-	nih_signal_set_handler (SIGHUP, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGHUP, hup_handler, NULL));
-
-	/* SIGUSR1 instructs us to reconnect to D-Bus */
-	nih_signal_set_handler (SIGUSR1, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
 #endif /* DEBUG */
 
 
@@ -279,25 +331,27 @@
 
 	/* Read configuration */
 	NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE));
-	NIH_MUST (conf_source_new (NULL, CONFDIR, CONF_JOB_DIR));
+	NIH_MUST (conf_source_new (NULL, conf_dir, CONF_JOB_DIR));
 
 	conf_reload ();
 
 	/* Create a listening server for private connections. */
-	while (control_server_open () < 0) {
-		NihError *err;
+	if (use_session_bus == FALSE) {
+		while (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);
+			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);
-			break;
 		}
-		nih_free (err);
 	}
 
-	/* Open connection to the system bus; we normally expect this to
+	/* Open connection to the appropriate D-Bus bus; we normally expect this to
 	 * fail and will try again later - don't let ENOMEM stop us though.
 	 */
 	while (control_bus_open () < 0) {
@@ -313,21 +367,32 @@
 	}
 
 #ifndef DEBUG
-	/* Now that the startup is complete, send all further logging output
-	 * to kmsg instead of to the console.
-	 */
-	if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
-		nih_free (nih_error_get ());
+	if (use_session_bus == FALSE) {
+		/* Now that the startup is complete, send all further logging output
+		 * to kmsg instead of to the console.
+		 */
+		if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
+			nih_free (nih_error_get ());
 
-	nih_log_set_logger (logger_kmsg);
+		nih_log_set_logger (logger_kmsg);
+	}
 #endif /* DEBUG */
 
 
 	/* Generate and run the startup event or read the state from the
 	 * init daemon that exec'd us
 	 */
-	if (! restart) {
-		NIH_MUST (event_new (NULL, STARTUP_EVENT, NULL));
+	if (! restart ) {
+		if (disable_startup_event) {
+			nih_debug ("Startup event disabled");
+		} else {
+			NIH_MUST (event_new (NULL,
+				initial_event
+				? initial_event
+				: STARTUP_EVENT,
+				NULL));
+		}
+
 	} else {
 		sigset_t mask;
 
@@ -573,3 +638,31 @@
 	}
 }
 #endif /* DEBUG */
+
+/**
+ * handle_confdir:
+ *
+ * Determine where system configuration files should be loaded from.
+ **/
+static void
+handle_confdir (void)
+{
+	char *dir;
+
+	/* user has already specified directory on command-line */
+	if (conf_dir)
+		goto out;
+
+	conf_dir = CONFDIR;
+
+	dir = getenv (CONFDIR_ENV);
+	if (! dir)
+		return;
+
+	conf_dir = dir;
+
+out:
+	nih_debug ("Using alternate configuration directory %s",
+			conf_dir);
+}
+

=== modified file 'init/man/init.8'
--- init/man/init.8	2010-02-04 19:26:17 +0000
+++ init/man/init.8	2011-06-03 09:26:24 +0000
@@ -1,4 +1,4 @@
-.TH init 8 2010-02-04 "Upstart"
+.TH init 8 2011-05-31 "Upstart"
 .\"
 .SH NAME
 init \- Upstart process management daemon
@@ -64,6 +64,27 @@
 by placing them on the kernel command-line.
 .\"
 .TP
+.B \-\-confdir \fIdirectory\fP
+Read job configuration files from a directory other than
+\fI/etc/init\fP.
+.\"
+.TP
+.B \-\-no\-startup\-event
+Suppress emission of the initial startup event. This option should only
+be used for testing since it will stop the 
+.BR init (8)
+daemon from starting \fBany\fP jobs automatically.
+.\"
+.TP
+.B \-\-session
+Connect to the D\-Bus session bus. This should only be used for testing.
+.\"
+.TP
+.B \-\-startup-event \fIevent\fP
+Specify a different initial startup event from the standard
+.BR startup (7) .
+.\"
+.TP
 .B --verbose
 Outputs verbose messages about job state changes and event emissions to the
 system console or log, useful for debugging boot.
@@ -90,7 +111,7 @@
 .RB < https://launchpad.net/upstart/+bugs >
 .\"
 .SH COPYRIGHT
-Copyright \(co 2010 Canonical Ltd.
+Copyright \(co 2009-2011 Canonical Ltd.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

=== modified file 'init/paths.h'
--- init/paths.h	2010-02-26 15:27:14 +0000
+++ init/paths.h	2011-06-03 09:26:24 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -67,7 +67,7 @@
 /**
  * CONFDIR:
  *
- * Top-level directory of the system configuration files.
+ * Default top-level directory of the system configuration files.
  **/
 #ifndef CONFDIR
 #define CONFDIR "/etc/init"
@@ -75,6 +75,20 @@
 
 
 /**
+ * CONFDIR_ENV:
+ *
+ * If this environment variable is set, read configuration files
+ * from the location specified, rather than CONFDIR.
+ *
+ * Value is expected to be the full path to an alternative job
+ * configuration directory.
+ **/
+#ifndef CONFDIR_ENV
+#define CONFDIR_ENV "UPSTART_CONFDIR"
+#endif
+
+
+/**
  * SHELL:
  *
  * This is the shell binary used whenever we need special processing for

=== modified file 'init/tests/test_conf.c'
--- init/tests/test_conf.c	2011-02-17 23:38:17 +0000
+++ init/tests/test_conf.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_conf.c - test suite for init/conf.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/tests/test_control.c'
--- init/tests/test_control.c	2011-03-16 22:42:48 +0000
+++ init/tests/test_control.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_dbus.c - test suite for init/dbus.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/tests/test_environ.c'
--- init/tests/test_environ.c	2011-03-16 22:42:48 +0000
+++ init/tests/test_environ.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_environ.c - test suite for init/environ.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/tests/test_job_class.c'
--- init/tests/test_job_class.c	2011-05-12 20:42:28 +0000
+++ init/tests/test_job_class.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_job_class.c - test suite for init/job_class.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c	2011-05-12 19:21:16 +0000
+++ init/tests/test_job_process.c	2011-06-03 09:26:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_job_process.c - test suite for init/job_process.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'po/upstart.pot'
--- po/upstart.pot	2011-03-22 17:52:25 +0000
+++ po/upstart.pot	2011-06-03 09:26:24 +0000
@@ -6,76 +6,141 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: upstart 1.2\n"
+"Project-Id-Version: upstart 1.3\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-22 10:52-0700\n"
+"POT-Creation-Date: 2011-05-31 17:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: init/conf.c:238
+#: init/conf.c:237
 msgid "Unable to load configuration"
 msgstr ""
 
-#: init/conf.c:271
+#: init/conf.c:270
 #, c-format
 msgid "Loading configuration from %s"
 msgstr ""
 
-#: init/conf.c:308
+#: init/conf.c:307
 #, c-format
 msgid "Handling deletion of %s"
 msgstr ""
 
-#: init/conf.c:379
+#: init/conf.c:378
 msgid "Unable to watch configuration file"
 msgstr ""
 
-#: init/conf.c:457
+#: init/conf.c:456
 msgid "Unable to watch configuration directory"
 msgstr ""
 
-#: init/conf.c:569 init/conf.c:653
+#: init/conf.c:568 init/conf.c:652
 msgid "Error while loading configuration file"
 msgstr ""
 
-#: init/conf.c:609
+#: init/conf.c:608
 msgid "Configuration directory deleted"
 msgstr ""
 
-#: init/control.c:155
+#: init/control.c:162
 msgid "Connection from private client"
 msgstr ""
 
-#: init/control.c:290
+#: init/control.c:301
 msgid "Disconnected from system bus"
 msgstr ""
 
-#: init/control.c:356 init/main.c:546
+#: init/control.c:367 init/main.c:611
 msgid "Reloading configuration"
 msgstr ""
 
-#: init/control.c:396 init/control.c:507
+#: init/control.c:407 init/control.c:518
 msgid "Name may not be empty string"
 msgstr ""
 
-#: init/control.c:405
+#: init/control.c:416
 #, c-format
 msgid "Unknown job: %s"
 msgstr ""
 
-#: init/control.c:514 init/job_class.c:522 init/job_class.c:710
-#: init/job_class.c:829 init/job_class.c:953
+#: init/control.c:525 init/job_class.c:524 init/job_class.c:712
+#: init/job_class.c:831 init/job_class.c:955
 msgid "Env must be KEY=VALUE pairs"
 msgstr ""
 
-#: init/control.c:666
+#: init/control.c:677
 msgid "The log priority given was not recognised"
 msgstr ""
 
+#: init/errors.h:58
+msgid "Illegal parameter"
+msgstr ""
+
+#: init/errors.h:59
+msgid "Unknown parameter"
+msgstr ""
+
+#: init/errors.h:60 init/errors.h:71
+msgid "Expected operator"
+msgstr ""
+
+#: init/errors.h:61
+msgid "Mismatched braces"
+msgstr ""
+
+#: init/errors.h:62
+msgid "Illegal interval, expected number of seconds"
+msgstr ""
+
+#: init/errors.h:63
+msgid "Illegal exit status, expected integer"
+msgstr ""
+
+#: init/errors.h:64
+msgid "Illegal signal status, expected integer"
+msgstr ""
+
+#: init/errors.h:65
+msgid "Illegal file creation mask, expected octal integer"
+msgstr ""
+
+#: init/errors.h:66
+msgid "Illegal nice value, expected -20 to 19"
+msgstr ""
+
+#: init/errors.h:67
+msgid "Illegal oom adjustment, expected -16 to 15 or 'never'"
+msgstr ""
+
+#: init/errors.h:68
+msgid "Illegal oom score adjustment, expected -999 to 1000 or 'never'"
+msgstr ""
+
+#: init/errors.h:69
+msgid "Illegal limit, expected 'unlimited' or integer"
+msgstr ""
+
+#: init/errors.h:70
+msgid "Expected event"
+msgstr ""
+
+#: init/errors.h:72
+msgid "Expected variable name before value"
+msgstr ""
+
+#: init/errors.h:73
+msgid "Mismatched parentheses"
+msgstr ""
+
+#: init/errors.h:74
+msgid "Name already taken"
+msgstr ""
+
 #: init/event.c:273
 #, c-format
 msgid "Handling %s event"
@@ -164,241 +229,252 @@
 msgid "post-stop"
 msgstr ""
 
-#: init/job.c:1113 init/job_class.c:756
+#: init/job.c:1113 init/job_class.c:758
 #, c-format
 msgid "Job is already running: %s"
 msgstr ""
 
-#: init/job.c:1177 init/job.c:1242 init/job_class.c:875 init/job_class.c:998
+#: init/job.c:1177 init/job.c:1242 init/job_class.c:877 init/job_class.c:1000
 #, c-format
 msgid "Job has already been stopped: %s"
 msgstr ""
 
-#: init/job_class.c:559 init/job_class.c:604 init/job_class.c:867
-#: init/job_class.c:990
+#: init/job_class.c:561 init/job_class.c:606 init/job_class.c:869
+#: init/job_class.c:992
 #, c-format
 msgid "Unknown instance: %s"
 msgstr ""
 
-#: init/job_process.c:279
+#: init/job_process.c:276
 #, c-format
 msgid "Failed to spawn %s %s process: %s"
 msgstr ""
 
-#: init/job_process.c:285
+#: init/job_process.c:282
 msgid "Temporary process spawn error"
 msgstr ""
 
-#: init/job_process.c:292
+#: init/job_process.c:289
 #, c-format
 msgid "%s %s process (%d)"
 msgstr ""
 
-#: init/job_process.c:399
+#: init/job_process.c:402
 #, c-format
 msgid "Pausing %s (%d) [pre-exec] for debug"
 msgstr ""
 
-#: init/job_process.c:453
+#: init/job_process.c:472
 #, c-format
 msgid "Failed to open system console: %s"
 msgstr ""
 
-#: init/job_process.c:669
+#: init/job_process.c:696
+#, c-format
+msgid "unable to move script fd: %s"
+msgstr ""
+
+#: init/job_process.c:701
 #, c-format
 msgid "unable to open console: %s"
 msgstr ""
 
-#: init/job_process.c:724
+#: init/job_process.c:756
 #, c-format
 msgid "unable to set \"%s\" resource limit: %s"
 msgstr ""
 
-#: init/job_process.c:729
+#: init/job_process.c:761
 #, c-format
 msgid "unable to set priority: %s"
 msgstr ""
 
-#: init/job_process.c:734
+#: init/job_process.c:766
 #, c-format
 msgid "unable to set oom adjustment: %s"
 msgstr ""
 
-#: init/job_process.c:739
+#: init/job_process.c:771
 #, c-format
 msgid "unable to change root directory: %s"
 msgstr ""
 
-#: init/job_process.c:744
+#: init/job_process.c:776
 #, c-format
 msgid "unable to change working directory: %s"
 msgstr ""
 
-#: init/job_process.c:749
+#: init/job_process.c:781
 #, c-format
 msgid "unable to set trace: %s"
 msgstr ""
 
-#: init/job_process.c:754
+#: init/job_process.c:786
 #, c-format
 msgid "unable to execute: %s"
 msgstr ""
 
-#: init/job_process.c:785
-#, c-format
-msgid "Sending TERM signal to %s %s process (%d)"
-msgstr ""
-
-#: init/job_process.c:793
-#, c-format
-msgid "Failed to send TERM signal to %s %s process (%d): %s"
-msgstr ""
-
-#: init/job_process.c:833
-#, c-format
-msgid "Sending KILL signal to %s %s process (%d)"
-msgstr ""
-
-#: init/job_process.c:841
-#, c-format
-msgid "Failed to send KILL signal to %s %s process (%d): %s"
-msgstr ""
-
-#: init/job_process.c:901
+#: init/job_process.c:817 init/job_process.c:867
+#, c-format
+msgid "Sending %s signal to %s %s process (%d)"
+msgstr ""
+
+#: init/job_process.c:826 init/job_process.c:876
+#, c-format
+msgid "Failed to send %s signal to %s %s process (%d): %s"
+msgstr ""
+
+#: init/job_process.c:937
 #, c-format
 msgid "%s %s process (%d) terminated with status %d"
 msgstr ""
 
-#: init/job_process.c:906
+#: init/job_process.c:942
 #, c-format
 msgid "%s %s process (%d) exited normally"
 msgstr ""
 
-#: init/job_process.c:921
+#: init/job_process.c:957
 #, c-format
 msgid "%s %s process (%d) killed by %s signal"
 msgstr ""
 
-#: init/job_process.c:925
+#: init/job_process.c:961
 #, c-format
 msgid "%s %s process (%d) killed by signal %d"
 msgstr ""
 
-#: init/job_process.c:939
+#: init/job_process.c:975
 #, c-format
 msgid "%s %s process (%d) stopped by %s signal"
 msgstr ""
 
-#: init/job_process.c:943
+#: init/job_process.c:979
 #, c-format
 msgid "%s %s process (%d) stopped by signal %d"
 msgstr ""
 
-#: init/job_process.c:957
+#: init/job_process.c:993
 #, c-format
 msgid "%s %s process (%d) continued by %s signal"
 msgstr ""
 
-#: init/job_process.c:961
+#: init/job_process.c:997
 #, c-format
 msgid "%s %s process (%d) continued by signal %d"
 msgstr ""
 
-#: init/job_process.c:1096
+#: init/job_process.c:1132
 #, c-format
 msgid "%s respawning too fast, stopped"
 msgstr ""
 
-#: init/job_process.c:1102
+#: init/job_process.c:1138
 #, c-format
 msgid "%s %s process ended, respawning"
 msgstr ""
 
-#: init/job_process.c:1342
+#: init/job_process.c:1378
 #, c-format
 msgid "Failed to set ptrace options for %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1355 init/job_process.c:1550
+#: init/job_process.c:1391 init/job_process.c:1586
 #, c-format
 msgid "Failed to continue traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1395 init/job_process.c:1486 init/job_process.c:1541
+#: init/job_process.c:1431 init/job_process.c:1522 init/job_process.c:1577
 #, c-format
 msgid "Failed to detach traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1435
+#: init/job_process.c:1471
 #, c-format
 msgid "Failed to deliver signal to traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1470
+#: init/job_process.c:1506
 #, c-format
 msgid "Failed to obtain child process id for %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1477
+#: init/job_process.c:1513
 #, c-format
 msgid "%s %s process (%d) became new process (%d)"
 msgstr ""
 
-#: init/job_process.c:1536
+#: init/job_process.c:1572
 #, c-format
 msgid "%s %s process (%d) executable changed"
 msgstr ""
 
-#: init/main.c:117
+#: init/main.c:123
+msgid "specify alternative directory to load configuration files from"
+msgstr ""
+
+#: init/main.c:126
+msgid "do not emit any startup event (for testing)"
+msgstr ""
+
+#: init/main.c:131
+msgid "use D-Bus session bus rather than system bus (for testing)"
+msgstr ""
+
+#: init/main.c:134
+msgid "specify an alternative initial event (for testing)"
+msgstr ""
+
+#: init/main.c:154
 msgid "Process management daemon."
 msgstr ""
 
-#: init/main.c:119
+#: init/main.c:156
 msgid ""
 "This daemon is normally executed by the kernel and given process id 1 to "
 "denote its special status.  When executed by a user process, it will "
 "actually run /sbin/telinit."
 msgstr ""
 
-#: init/main.c:130 util/reboot.c:167 util/shutdown.c:363 util/telinit.c:148
+#: init/main.c:172 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148
 msgid "Need to be root"
 msgstr ""
 
-#: init/main.c:139
+#: init/main.c:181
 msgid "Not being executed as init"
 msgstr ""
 
-#: init/main.c:187 init/main.c:456
+#: init/main.c:229 init/main.c:521
 msgid "Unable to set root directory"
 msgstr ""
 
-#: init/main.c:198
+#: init/main.c:240
 msgid "Unable to mount /proc filesystem"
 msgstr ""
 
-#: init/main.c:207
+#: init/main.c:249
 msgid "Unable to mount /sys filesystem"
 msgstr ""
 
-#: init/main.c:292
+#: init/main.c:345
 msgid "Unable to listen for private connections"
 msgstr ""
 
-#: init/main.c:473
+#: init/main.c:538
 #, c-format
 msgid "Caught %s, core dumped"
 msgstr ""
 
-#: init/main.c:477
+#: init/main.c:542
 #, c-format
 msgid "Caught %s, unable to dump core"
 msgstr ""
 
-#: init/main.c:563
+#: init/main.c:628
 msgid "Reconnecting to system bus"
 msgstr ""
 
-#: init/main.c:569
+#: init/main.c:634
 msgid "Unable to connect to the system bus"
 msgstr ""
 
@@ -589,59 +665,59 @@
 "Without arguments, this outputs the current log priority."
 msgstr ""
 
-#: util/reboot.c:114
+#: util/reboot.c:113
 msgid "don't sync before reboot or halt"
 msgstr ""
 
-#: util/reboot.c:116
+#: util/reboot.c:115
 msgid "force reboot or halt, don't call shutdown(8)"
 msgstr ""
 
-#: util/reboot.c:118
+#: util/reboot.c:117
 msgid "switch off the power when called as halt"
 msgstr ""
 
-#: util/reboot.c:120
+#: util/reboot.c:119
 msgid "don't actually reboot or halt, just write wtmp record"
 msgstr ""
 
-#: util/reboot.c:145
+#: util/reboot.c:144
 msgid "Halt the system."
 msgstr ""
 
-#: util/reboot.c:148
+#: util/reboot.c:147
 msgid "Power off the system."
 msgstr ""
 
-#: util/reboot.c:151
+#: util/reboot.c:150
 msgid "Reboot the system."
 msgstr ""
 
-#: util/reboot.c:155
+#: util/reboot.c:154
 msgid ""
 "This command is intended to instruct the kernel to reboot or halt the "
 "system; when run without the -f option, or when in a system runlevel other "
 "than 0 or 6, it will actually execute /sbin/shutdown.\n"
 msgstr ""
 
-#: util/reboot.c:211
+#: util/reboot.c:210
 msgid "Calling shutdown"
 msgstr ""
 
-#: util/reboot.c:214
+#: util/reboot.c:213
 #, c-format
 msgid "Unable to execute shutdown: %s"
 msgstr ""
 
-#: util/reboot.c:235
+#: util/reboot.c:234
 msgid "Rebooting"
 msgstr ""
 
-#: util/reboot.c:239
+#: util/reboot.c:238
 msgid "Halting"
 msgstr ""
 
-#: util/reboot.c:243
+#: util/reboot.c:242
 msgid "Powering off"
 msgstr ""
 

=== modified file 'util/reboot.c'
--- util/reboot.c	2011-03-16 22:18:22 +0000
+++ util/reboot.c	2011-06-03 09:26:24 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *