Merge lp:~vorlon/upstart/lp.980917 into lp:upstart
Proposed by
Steve Langasek
Status: | Work in progress |
---|---|
Proposed branch: | lp:~vorlon/upstart/lp.980917 |
Merge into: | lp:upstart |
Diff against target: |
135 lines (+50/-9) 3 files modified
init/main.c (+42/-3) init/system.c (+6/-5) init/system.h (+2/-1) |
To merge this branch: | bzr merge lp:~vorlon/upstart/lp.980917 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Hunt | Needs Fixing | ||
Upstart Reviewers | Pending | ||
Review via email: mp+117985@code.launchpad.net |
Description of the change
Build on top of lp:~jamesodhunt/upstart/bug-980917, addressing the case where
we would mount /dev unnecessarily (and possibly contrary to the system's
filesystem configuration)
To post a comment you must log in.
Unmerged revisions
- 1378. By Steve Langasek
-
skip non-idiomatic duplication of needs_devtmpfs
- 1377. By Steve Langasek
-
set correct permissions on /dev/ptmx when creating
- 1376. By Steve Langasek
-
fix ordering of mknod args
Hi Steve,
Good catch! The patch seems to have a stray 'needs_devtmpfs' at line 304:
301 if (stat ("/dev/ptmx", &statbuf) < 0 || !S_ISCHR( statbuf. st_mode) st_dev) != 5 || minor(statbuf. st_dev) != 2) statbuf. st_mode) )
302 || major(statbuf.
303 needs_devtmpfs = 1;
304 if (needs_devtmpfs
305 || stat("/dev/pts", &statbuf) < 0 || !S_ISDIR(
306 needs_devtmpfs = 1;
Also, I noticed (gcc didn't ;-) that the mknod parameters have been inadvertently transposed. To be safe we should also specify the permissions for the device nodes we're creating (and possibly explicitly set umask).
Finally, I think we need a slightly more holistic view on Upstart- in-initramfs- less-environmen ts since we cannot assume any devices exist, including /dev/null, /dev/console, /dev/kmsg, /dev/tty. On Ubuntu, I don't think we'd see an issue since when a system is installed from the live media, some devices already exist. However, we cannot assume that for all systems.