Merge authors:
Steve Langasek (vorlon)
Related merge proposals:
https://code.launchpad.net/~vorlon/upstart/lp.980917-redux/+merge/118461
proposed by: Steve Langasek (vorlon)
review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1376 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Tue 2012-08-07 15:33:12 +0100
message:
Merge of lp:~vorlon/upstart/lp.980917-redux.
modified:
init/main.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/main.c'
--- init/main.c 2012-08-03 15:47:59 +0000
+++ init/main.c 2012-08-07 14:33:12 +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)
+ 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)
needs_devtmpfs = 1;
if (needs_devtmpfs) {
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
