Merge lp:~jamesodhunt/upstart/bug-980917-the-bug-that-would-not-die into lp:upstart

[James Hunt]

* init/main.c: main(): Remove checks for /dev/kmsg, /dev/null,
  /dev/console and /dev/tty since some environments use different
  major/minor numbers to the norm (for example on LXC, /dev/console is
  not (5,1), but (136,*)). Do not attempt to create /dev/console again,
  due to LXC numbering difference.

[Steve Langasek (vorlon)]

@@ -290,7 +286,6 @@
                 */
                system_mknod ("/dev/null", (S_IFCHR | 0666), makedev (1, 3));
                system_mknod ("/dev/tty", (S_IFCHR | 0666), makedev (5, 0));
- system_mknod ("/dev/console", (S_IFCHR | 0600), makedev (5, 1));
                system_mknod ("/dev/kmsg", (S_IFCHR | 0600), makedev (1, 11));

                /* Set the standard file descriptors to the ordinary console device,

Per https://code.launchpad.net/~jamesodhunt/upstart/bug-980917-reworked/+merge/118132/comments/253998, we should also omit the mknod of /dev/null and /dev/kmsg, which are guaranteed to be provided at the time devtmpfs is mounted.

I'll fix this up and push.

review: Approve

[Steve Langasek (vorlon)]

Actually, on second thought: while I don't think the mknod()s here will ever do any good, they also aren't harmful in the case that the device file already exists. So it's fine to keep all of them, *including* the /dev/console one... so I'll just add that back.

=== modified file 'ChangeLog'
--- ChangeLog	2012-08-03 15:47:59 +0000
+++ ChangeLog	2012-08-07 15:24:24 +0000
@@ -1,3 +1,11 @@
[phone]  James Hunt  <[e-mail]>
+
+	* init/main.c: main(): Remove checks for /dev/kmsg, /dev/null,
+	  /dev/console and /dev/tty since some environments use different
+	  major/minor numbers to the norm (for example on LXC, /dev/console is
+	  not (5,1), but (136,*)). Do not attempt to create /dev/console again,
+	  due to LXC numbering difference.
+
 2012-08-03  James Hunt  <[e-mail]>
 
 	* init/main.c:main(): Handle hostile initramfs-less environments by

=== modified file 'init/main.c'
--- init/main.c	2012-08-07 14:33:12 +0000
+++ init/main.c	2012-08-07 15:24:24 +0000
@@ -244,15 +244,11 @@
 		 */
 		(void)umask (0);
 
-		/* Check if key devices already exist; if they do,
+		/* Check if key /dev entries already exist; if they do,
 		 * we should assume we don't need to mount /dev.
 		 */
 		if (system_check_file ("/dev/ptmx", S_IFCHR, makedev (5, 2)) < 0
-			|| system_check_file ("/dev/pts", S_IFDIR, 0) < 0
-			|| system_check_file ("/dev/kmsg", S_IFCHR, makedev (1, 11)) < 0
-			|| system_check_file ("/dev/null", S_IFCHR, makedev (1, 3)) < 0
-			|| system_check_file ("/dev/console", S_IFCHR, makedev (5, 1)) < 0
-			|| system_check_file ("/dev/tty", S_IFCHR, makedev (5, 0)) < 0)
+			|| system_check_file ("/dev/pts", S_IFDIR, 0) < 0)
 			needs_devtmpfs = 1;
 
 		if (needs_devtmpfs) {
@@ -290,7 +286,6 @@
 		 */
 		system_mknod ("/dev/null", (S_IFCHR | 0666), makedev (1, 3));
 		system_mknod ("/dev/tty", (S_IFCHR | 0666), makedev (5, 0));
-		system_mknod ("/dev/console", (S_IFCHR | 0600), makedev (5, 1));
 		system_mknod ("/dev/kmsg", (S_IFCHR | 0600), makedev (1, 11));
 
 		/* Set the standard file descriptors to the ordinary console device,