lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201201192036
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201201192036
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 595 lines (+580/-0) (has conflicts)2 files modified.pc/0020-drop-cap-mac-admin.patch/templates/lxc-ubuntu.in (+561/-0)
debian/patches/0020-drop-cap-mac-admin.patch (+19/-0)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 47. By Serge Hallyn
-
* update 0016-nested-
cgroups. patch: create cgroup dirs 0755 so that
* debian/local/lxc- start-ephemeral : support in-line commands (LP: #914169) - 46. By Serge Hallyn
-
udpate 0016-nested-
cgroups. patch: create cgroup dirs 0755 so that
unprivileged users can read them (with lxc-ls). - 45. By Serge Hallyn
-
debian/
patches/ 0020-drop- cap-mac- admin.patch - to prevent containers
from loading apparmor policy. - 44. By Serge Hallyn
-
[ Robie Basak ]
* debian/patches/ 0015-ubuntu- templ-use- updates. patch: use ports.ubuntu.com
in sources.list for alternative architectures (LP: #820715).
* debian/patches/ 0015-ubuntu- templ-use- updates. patch: dist-upgrade in an
isolated environment to avoid leaving a bind mount behind (LP: #913877).
* debian/lxc.{default, init}: call ifconfig with explicit netmask
(LP: #913727).[ Serge Hallyn ]
* debian/lxc.default: update the MIRROR example - using 'localhost'
fails for updates after the container has been started.
* debian/lxcguest. console. upstart: pass 'console' not '/dev/console' to
getty. (LP: #913952)
* debian/patches/ 0015-ubuntu- templ-use- updates. patch: at post_process(),
copy host's /etc/resolv.conf (which may have changed) into chroot before
apt-get actions, and always do a apt-get update before installing lxcguest,
as the package version may have changed in the archive. (LP: #914155)
* 0016-nested-cgroups. patch: nest container cgroups under the host's
init cgroup. (LP: #901482)
* 0017-pull-upstream- fedora- template. patch: move to the upstream
lxc-fedora template (LP: #881903)
* 0018-make-lxc-ps- search- proc.patch: work when cgroups are mounted with
'-n'.
* debian/patches/ 0019-fix- lxc-ls- nested- cgroups. patch: fix lxc-ls to
handle the support for nested cgroups. (pull this into previous
commit msg before pushing) - 43. By Serge Hallyn
-
* add a default bridge for lxc to use. (LP: #801002)
* Add debian/lxc.conf, which gets installed as /etc/lxc/lxc.conf as a
sample, usable, default config. (LP: #823862)
* Add precise to the list of distros
* Add -updates and -security to /etc/apt/sources. list after debootstrap
for container creation (LP: #820715) - 41. By Stéphane Graber
-
* Remove auto-generated debian-
changes- 0.7.5-3ubuntu1.
* Cherry-pick Ubuntu template tweaks from upstream:
- Set a list of capabilities to drop
- Allow containers to create tap devices
- Allow mknod for any device
- Drop mac_override and mac_admin - 40. By Stéphane Graber
-
[ Serge Hallyn ]
* Merge from unstable. Remaining changes:
- Add lxcguest package (contains lxc-is-container and upstart jobs)
- debian/control: add cgroup-lite | cgroup-bin Recommends to the lxc package
- debian/lxc.install - README gets (mis-)installed under --with-rootdir.
- remove debian/lxc.{pre, post}inst
- keep debian/lxc.default - removing the now obsolete RUN line, and
adding the new LXC_AUTO variable.
- keep all 000* patches
+ 0001-monitor-support- quit.patch
+ 0002-fix-personality- segfault. patch
+ 0003-non-fatal-unsupport ed-personality. patch
+ 0004-fix-ubuntu- template- only-install- essential. patch
+ 0005-fix-sshd-template. patch
+ 0006-fix-checkconfig. patch
+ 0007-fix-lxc-clone- hostname. patch
+ 0008-fix-bindhome- in-template. patch
+ 0009-ubuntu-template- drop-resolvconf .patch [ Stéphane Graber ]
* Merge from unstable. Remaining changes:
- Remove debian/lxc.templates and debian/lxc.install as we kept our
default file and dropped debian's pre/post i:nst scripts.
- Add lxc-start-ephemeral and lxc-is-container to debian/local - 39. By Serge Hallyn
-
* debian/
patches/ 0009-ubuntu- template- drop-resolvconf .patch:
Drop resolvconf from package list for oneiric containers. It appears
to stop containers from getting a useful resolv.conf without doing
ifdown; ifup; and is apparently unwanted anyway. (LP: #880020)
* debian/lxcguest. lxcguest. upstart: mkdir /run/lock on boot
(LP: #880030)
* debian/fstab.lxc and debian/fstab.libvirt: mount tmpfs on /run/lock,
not /var/lock (as per new stock /lib/init/fstab). - 38. By Serge Hallyn
-
debian/
patches/ 0008-fix- bindhome- in-template. patch: fix a bug in the
ubuntu template: if the user specified with -b does not exist, a bad
container fstab was created, so that, with no warning or indication of
why, the container failed to start. (LP: #879052)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/precise/lxc