Merge lp://qastaging/~stgraber/ubuntu/precise/upstart/upstart-containers into lp://qastaging/ubuntu/precise/upstart
| Status: | Merged |
|---|---|
| Merged at revision: | 1362 |
| Proposed branch: | lp://qastaging/~stgraber/ubuntu/precise/upstart/upstart-containers |
| Merge into: | lp://qastaging/ubuntu/precise/upstart |
| Diff against target: |
227 lines (+113/-7) 12 files modified
debian/changelog (+24/-0) debian/conf/console.conf (+11/-0) debian/conf/container-detect.conf (+42/-0) debian/conf/tty1.conf (+5/-1) debian/conf/tty2.conf (+5/-1) debian/conf/tty3.conf (+5/-1) debian/conf/tty4.conf (+5/-1) debian/conf/tty5.conf (+2/-1) debian/conf/tty6.conf (+2/-1) debian/control (+1/-1) debian/running-in-container (+10/-0) debian/upstart.install (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~stgraber/ubuntu/precise/upstart/upstart-containers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Hunt (community) | Approve | ||
| Steve Langasek | Pending | ||
|
Review via email:
|
|||
Description of the change
Merge proposal to make our default upstart jobs container aware.
Add a new container-detect job:
- emits 'container CONTAINER=type' if in a container
(with type: lxc, lxc-libvirt, openvz or vserver)
- emits 'not-container' otherwise
- writes the container type to /run/container_type for use by
running-
Adds a new tool running-
and return 0 if in a container, returning 1 otherwise.
Add a new console.conf getty job starting only in plain LXC containers.
Update tty[1234] to start on regular machines as well as LXC and
libvirt LXC.
Update tty[56] to only start on regular machines.
Add a Conflict on lxcguest (now useless and providing lxcconsole.conf
which would conflict with the new console.conf).
| Stéphane Graber (stgraber) wrote | # |
| Stéphane Graber (stgraber) wrote | # |
I tested these changes in a lxc container and in a Precise VM, both seemed to work fine.
I have a test package in my experimental PPA: https:/