Merge lp:~vorlon/ubuntu/precise/upstart/lp.876626 into lp:ubuntu/precise/upstart

[Steve Langasek]

Hi James,

Here's a branch that reverts the console handling in upstart for Ubuntu, as
discussed. If this looks good to you, I can include it for an SRU to
precise.

I've made a similar change for oneiric, but for some reason launchpad
doesn't have a UDD branch for oneiric-updates, so I've uploaded that one
directly to the SRU queue.

[James Hunt (jamesodhunt)]

Looks fine to me.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-20 04:06:59 +0000
+++ debian/changelog	2012-04-24 20:35:37 +0000
@@ -2,6 +2,10 @@
 
   * debian/upstart.logrotate: don't create empty files after rotation;
     upstart will automatically create new log files for jobs as needed.
+  * init/main.c: restore the fix for bug #540256; we know the console setup
+    is taken care of by plymouth in Ubuntu, so upstart changing the console
+    settings just makes trouble (such as turning echo back on when it
+    shouldn't be).  LP: #876626.
 
  -- Steve Langasek <[e-mail]>  Thu, 19 Apr 2012 21:06:24 -0700
 
 
=== modified file 'init/main.c'
--- init/main.c	2012-03-22 14:38:46 +0000
+++ init/main.c	2012-04-24 20:35:37 +0000
@@ -244,22 +244,13 @@
 		 * 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) {
-			NihError *err;
-	
+		if (system_setup_console (CONSOLE_NONE, (! restart)) < 0) {
 			err = nih_error_get ();
-			nih_warn ("%s: %s", _("Unable to initialize console, will try /dev/null"),
-				  err->message);
+			nih_fatal ("%s: %s", _("Unable to initialize console as /dev/null"),
+				   err->message);
 			nih_free (err);
 	
-			if (system_setup_console (CONSOLE_NONE, FALSE) < 0) {
-				err = nih_error_get ();
-				nih_fatal ("%s: %s", _("Unable to initialize console as /dev/null"),
-					   err->message);
-				nih_free (err);
-	
-				exit (1);
-			}
+			exit (1);
 		}
 
 		/* Set the PATH environment variable */