Merge lp:~jamesodhunt/ubuntu/precise/upstart/bug-935585 into lp:ubuntu/precise/upstart

[James Hunt]

  [ Steve Langasek ]
  * debian/conf/failsafe.conf: instead of waiting for the 'runlevel' event
    before considering failsafe done, stop this job as soon as we're
    starting rc-sysinit; that way, any delays in /etc/rcS.d will not cause
    confusing messages about networking delays when the network is not the
    problem. LP: #950662.

  [ James Hunt ]
  * init/log.c:log_read_watch(): Set remote_closed for scenarios where error
     handler never called (LP: #935585).

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-09 19:43:20 +0000
+++ debian/changelog	2012-03-16 17:35:29 +0000
@@ -1,12 +1,17 @@
-upstart (1.4-0ubuntu9) UNRELEASED; urgency=low
+upstart (1.4-0ubuntu9) precise; urgency=low
 
+  [ Steve Langasek ]
   * debian/conf/failsafe.conf: instead of waiting for the 'runlevel' event
     before considering failsafe done, stop this job as soon as we're
     starting rc-sysinit; that way, any delays in /etc/rcS.d will not cause
     confusing messages about networking delays when the network is not the
     problem.  LP: #950662.
 
- -- Steve Langasek <[e-mail]>  Fri, 09 Mar 2012 11:41:55 -0800
+  [ James Hunt ]
+  * init/log.c:log_read_watch(): Set remote_closed for scenarios where error
+     handler never called (LP: #935585).
+
+ -- James Hunt <[e-mail]>  Fri, 16 Mar 2012 17:20:11 +0000
 
 upstart (1.4-0ubuntu8) precise; urgency=low
 

=== modified file 'init/log.c'
--- init/log.c	2012-02-14 16:56:51 +0000
+++ init/log.c	2012-03-16 17:35:29 +0000
@@ -685,6 +685,17 @@
 			break;
 		}
 	}
+
+	/* Job process has ended and we've drained all the data the job
+	 * produced, so remote end must have closed.
+	 *
+	 * This cannot be handled entirely by log_io_error_handler()
+	 * since the job may produce some output prior to disks being
+	 * writeable, then end without producing further output.
+	 * In this scenario the error handler is never called.
+	 *
+	 */
+	log->remote_closed = 1;
 }
 
 /**