diff -rc upstart-0.3.0-orig/init/main.c upstart-0.3.0/init/main.c
*** upstart-0.3.0-orig/init/main.c	2006-10-13 14:35:16.000000000 +0200
--- upstart-0.3.0/init/main.c	2006-11-19 21:41:01.000000000 +0100
***************
*** 206,215 ****
  	control_open ();
  
  	/* Read configuration */
! 	cfg_watch_dir (NULL, CFG_DIR, NULL);
  
  	/* Set the PATH environment variable */
! 	setenv ("PATH", PATH, TRUE);
  
  
  	/* Generate and run the startup event or read the state from the
--- 206,217 ----
  	control_open ();
  
  	/* Read configuration */
!         char *cfg_dir = getenv("UPSTART_CFG_DIR");
!         if (!cfg_dir) cfg_dir = CFG_DIR;
! 	cfg_watch_dir (NULL, cfg_dir, NULL);
  
  	/* Set the PATH environment variable */
! 	/* setenv ("PATH", PATH, TRUE); */
  
  
  	/* Generate and run the startup event or read the state from the
diff -rc upstart-0.3.0-orig/util/initctl.c upstart-0.3.0/util/initctl.c
*** upstart-0.3.0-orig/util/initctl.c	2006-10-13 16:18:06.000000000 +0200
--- upstart-0.3.0/util/initctl.c	2006-11-20 16:53:21.000000000 +0100
***************
*** 95,105 ****
  		} else if (! strcmp (command->command, "stop")) {
  			msg.type = UPSTART_JOB_STOP;
  			msg.job_stop.name = *arg;
- 			break;
  		} else if (! strcmp (command->command, "status")) {
  			msg.type = UPSTART_JOB_QUERY;
  			msg.job_stop.name = *arg;
- 			break;
  		}
  
  		/* Send the message */
--- 95,103 ----