Merge lp:~vorlon/upstart/lp.980917-redux into lp:upstart

[Steve Langasek]

Slight improvements to the landed fix for bug #980917, which try to minimize
the number of unnecessary filesystem accesses when trying to determine
whether to mount devtmpfs.

[James Hunt (jamesodhunt)]

Looks good to me.

review: Approve

[James Hunt (jamesodhunt)]

actually, there is an extra brace in there which I'll remove.

=== modified file 'init/main.c'
--- init/main.c	2012-08-03 15:47:59 +0000
+++ init/main.c	2012-08-07 01:32:18 +0000
@@ -247,22 +247,12 @@
 		/* Check if key devices already exist; if they do,
 		 * we should assume we don't need to mount /dev.
 		 */
-		if (system_check_file ("/dev/null", S_IFCHR, makedev (1, 3)) < 0)
-			needs_devtmpfs = 1;
-
-		if (system_check_file ("/dev/console", S_IFCHR, makedev (5, 1)) < 0)
-			needs_devtmpfs = 1;
-
-		if (system_check_file ("/dev/tty", S_IFCHR, makedev (5, 0)) < 0)
-			needs_devtmpfs = 1;
-
-		if (system_check_file ("/dev/kmsg", S_IFCHR, makedev (1, 11)) < 0)
-			needs_devtmpfs = 1;
-
 		if (system_check_file ("/dev/ptmx", S_IFCHR, makedev (5, 2)) < 0)
-			needs_devtmpfs = 1;
-
-		if (system_check_file ("/dev/pts", S_IFDIR, 0) < 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)
 			needs_devtmpfs = 1;
 
 		if (needs_devtmpfs) {