Merge lp:~jamesodhunt/upstart/bug-980917-the-bug-that-would-not-die into lp:upstart
Proposed by
James Hunt
Status: | Merged |
---|---|
Merged at revision: | 1377 |
Proposed branch: | lp:~jamesodhunt/upstart/bug-980917-the-bug-that-would-not-die |
Merge into: | lp:upstart |
Diff against target: |
45 lines (+10/-7) 2 files modified
ChangeLog (+8/-0) init/main.c (+2/-7) |
To merge this branch: | bzr merge lp:~jamesodhunt/upstart/bug-980917-the-bug-that-would-not-die |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Langasek | Approve | ||
Review via email: mp+118579@code.launchpad.net |
Description of the change
* 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.
To post a comment you must log in.
@@ -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/kmsg", (S_IFCHR | 0600), makedev (1, 11));
*/
- system_mknod ("/dev/console", (S_IFCHR | 0600), makedev (5, 1));
/* Set the standard file descriptors to the ordinary console device,
Per https:/ /code.launchpad .net/~jamesodhu nt/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.