Merge lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/fix-chroot-sessions into lp://qastaging/ubuntu/natty/upstart
Proposed by
James Hunt
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merge reported by: | Clint Byrum | ||||||||||||
| Merged at revision: | not available | ||||||||||||
| Proposed branch: | lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/fix-chroot-sessions | ||||||||||||
| Merge into: | lp://qastaging/ubuntu/natty/upstart | ||||||||||||
| Diff against target: |
4753 lines (+842/-700) 38 files modified
ChangeLog (+62/-0) NEWS (+21/-0) configure.ac (+1/-1) debian/changelog (+28/-0) debian/upstart-job (+14/-4) init/Makefile.am (+4/-2) init/conf.c (+18/-12) init/conf.h (+1/-1) init/control.c (+5/-1) init/job.c (+8/-2) init/job_class.c (+34/-14) init/job_process.c (+59/-0) init/job_process.h (+3/-1) init/main.c (+8/-0) init/man/init.5 (+0/-38) init/man/init.8 (+11/-7) init/parse_job.c (+2/-2) init/session.c (+21/-8) init/session.h (+27/-2) init/tests/test_blocked.c (+4/-6) init/tests/test_conf.c (+15/-22) init/tests/test_control.c (+11/-12) init/tests/test_environ.c (+3/-0) init/tests/test_event.c (+28/-40) init/tests/test_event_operator.c (+3/-0) init/tests/test_job.c (+70/-148) init/tests/test_job_class.c (+54/-145) init/tests/test_job_process.c (+34/-59) init/tests/test_parse_conf.c (+3/-0) init/tests/test_parse_job.c (+3/-0) init/tests/test_process.c (+3/-0) init/tests/test_system.c (+3/-0) po/upstart.pot (+152/-136) scripts/init-checkconf.sh (+34/-10) scripts/man/init-checkconf.8 (+22/-10) util/initctl.c (+16/-5) util/man/initctl.8 (+3/-1) util/tests/test_initctl.c (+54/-11) |
||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/fix-chroot-sessions | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Clint Byrum (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
* Important fixes for user sessions (currently disabled in Ubuntu) and chroot sessions (which previously could cause an out-of-memory condition).
* Clints fix for bug 707479.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I've been testing this for over a week on two natty machines kept up to date on a daily basis. I've seen no breakage, and this fixes a critical bug. The change to upstart-job is a bit late, and could be removed, but at this point I feel its better having the package as it has been tested by some of us uploaded rather than something with only half the fixes.
Approved, and uploading to natty for release team approval.