Merge authors: James Hunt (jamesodhunt) Related merge proposals: https://code.launchpad.net/~jamesodhunt/upstart/bug-980917-the-bug-that-would-not-die/+merge/118579 proposed by: James Hunt (jamesodhunt) review: Approve - Steve Langasek (vorlon) ------------------------------------------------------------ revno: 1377 [merge] committer: Steve Langasek <[email protected]> branch nick: upstream timestamp: Tue 2012-08-07 09:39:00 -0700 message: Merge lp:~jamesodhunt/upstart/bug-980917-the-bug-that-would-not-die, fixing the issue Serge Hallyn pointed out with /dev/console having different maj,min in lxc containers. Restore the system_mknod(/dev/console) though, which is always harmless except for the clock time penalty since it won't overwrite an existing device file. modified: ChangeLog 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 'ChangeLog' --- ChangeLog 2012-08-03 15:47:59 +0000 +++ ChangeLog 2012-08-07 15:21:20 +0000 @@ -1,3 +1,11 @@ +2012-08-07 James Hunt <[email protected]> + + * 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 <[email protected]> * 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 16:39:00 +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) {
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
