Merge lp://staging/~jamesodhunt/ubuntu/utopic/cgmanager/enable-upstart-cgroup-support into lp://staging/ubuntu/utopic/cgmanager
| Status: | Merged |
|---|---|
| Merged at revision: | 45 |
| Proposed branch: | lp://staging/~jamesodhunt/ubuntu/utopic/cgmanager/enable-upstart-cgroup-support |
| Merge into: | lp://staging/ubuntu/utopic/cgmanager |
| Diff against target: |
37 lines (+13/-1) 3 files modified
debian/cgmanager.cgmanager.upstart (+2/-0) debian/cgmanager.cgproxy.upstart (+4/-1) debian/changelog (+7/-0) |
| To merge this branch: | bzr merge lp://staging/~jamesodhunt/ubuntu/utopic/cgmanager/enable-upstart-cgroup-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dimitri John Ledkov | Pending | ||
|
Review via email:
|
|||
Description of the change
Upstart 1.13 now includes cgroup support. However, it is not enabled until init is notified that the cgmanager is running by invoking 'initctl notify-
This MP makes that call once the cgmanager is running.
XXX: Note the '|| true' which is to avoid a circular dependency by making cgmanager depend on 'upstart (>= 1.13)' (since upstart already indirectly depends on cgmanager via the libcgmanager-dev build-dep. The '|| true' therefore will attempt to enable cgroup support of the version of upstart running supports it, but not fail if it doesn't.
Assigned to xnox as result of Foundations meeting on #ubuntu-meeting today as we wish to delay the upload for a few days:
<snip>
6:25:15 <xnox> jodh: and i'd want to land that when it's relatively quite in the archive, It's not at the moment. Maybe later on friday and/or over the weekend - monday time.
6:26:28 <jodh> xnox: I vote for Monday (Warsaw's Second Law :)
</snip>
| Serge Hallyn (serge-hallyn) wrote | # |
| James Hunt (jamesodhunt) wrote | # |
| Dimitri John Ledkov (xnox) wrote | # |
Looks good to me, thanks. James, note that we now have upstart and sysv init scripts in upstream cgmanager git, under config/init/. Can you post a git pull request to do the same there?