Merge lp:~vorlon/upstart/lp.1244763 into lp:upstart
Proposed by
Steve Langasek
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 1553 | ||||
Proposed branch: | lp:~vorlon/upstart/lp.1244763 | ||||
Merge into: | lp:upstart | ||||
Diff against target: |
114 lines (+25/-15) 4 files modified
ChangeLog (+7/-0) init/main.c (+8/-4) init/system.c (+9/-10) init/system.h (+1/-1) |
||||
To merge this branch: | bzr merge lp:~vorlon/upstart/lp.1244763 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dimitri John Ledkov | Approve | ||
Adam Conrad (community) | Approve | ||
Review via email: mp+192739@code.launchpad.net |
Description of the change
Straightforward change to fix bug #1244763. Adam will test this on an
initramfsless system to confirm it DTRT.
To post a comment you must log in.
Tested on a machine that exhibits the issue, results pre and post-patching:
============ unpatched output ============== data=ordered 0 0 size=8223712k, nr_inodes= 2055928, mode=755 0 0 noexec, relatime, mode=600 0 0 nodev,noexec, relatime 0 0 nodev,noexec, relatime 0 0 size=4k, mode=755 0 0 fuse/connection s fusectl rw,relatime 0 0 noexec, relatime, size=1644764k, mode=755 0 0 nodev,noexec, relatime, size=5120k 0 0 nodev,relatime 0 0 nodev,noexec, relatime, size=102400k, mode=755 0 0 cgroup/ systemd cgroup rw,nosuid, nodev,noexec, relatime, name=systemd 0 0
beebe:~$ cat /proc/mounts
rootfs / rootfs rw 0 0
/dev/root / ext4 rw,relatime,
devtmpfs /dev devtmpfs rw,relatime,
none /dev/pts devpts rw,nosuid,
none /proc proc rw,nosuid,
none /sys sysfs rw,nosuid,
none /sys/fs/cgroup tmpfs rw,relatime,
none /sys/fs/
none /sys/kernel/debug debugfs rw,relatime 0 0
none /run tmpfs rw,nosuid,
none /run/lock tmpfs rw,nosuid,
none /run/shm tmpfs rw,nosuid,
none /run/user tmpfs rw,nosuid,
systemd /sys/fs/
============= patched output =============== data=ordered 0 0 size=8223712k, nr_inodes= 2055928, mode=755 0 0 noexec, relatime, gid=5,mode= 620 0 0 nodev,noexec, relatime 0 0 nodev,noexec, relatime 0 0 size=4k, mode=755 0 0 fuse/connection s fusectl rw,relatime 0 0 noexec, relatime, size=1644764k, mode=755 0 0 nodev,noexec, relatime, size=5120k 0 0 nodev,relatime 0 0 nodev,noexec, relatime, size=102400k, mode=755 0 0 cgroup/ systemd cgroup rw,nosuid, nodev,noexec, relatime, name=systemd 0 0
beebe:~$ cat /proc/mounts
rootfs / rootfs rw 0 0
/dev/root / ext4 rw,relatime,
devtmpfs /dev devtmpfs rw,relatime,
none /dev/pts devpts rw,nosuid,
none /proc proc rw,nosuid,
none /sys sysfs rw,nosuid,
none /sys/fs/cgroup tmpfs rw,relatime,
none /sys/fs/
none /sys/kernel/debug debugfs rw,relatime 0 0
none /run tmpfs rw,nosuid,
none /run/lock tmpfs rw,nosuid,
none /run/shm tmpfs rw,nosuid,
none /run/user tmpfs rw,nosuid,
systemd /sys/fs/
System seems otherwise fine, no new hiccups in booting, and the only mount that appears different is devpts, for the better.