lp:~ubuntu-branches/ubuntu/quantal/lxc/quantal-201205182338

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/quantal/lxc

Ubuntu branches: Pending requested 2012-05-18

Diff: 1138 lines (+1108/-0) (has conflicts)

5 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/0083-ubuntu-simplify-template/templates/lxc-ubuntu.in (+715/-0)
debian/lxc-default-with-nesting.apparmor (+56/-0)
debian/patches/0083-ubuntu-simplify-template (+335/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

104. By Stéphane Graber on 2012-05-18

releasing version 0.8.0~rc1-4ubuntu8

103. By Stéphane Graber on 2012-05-18

Add lxc-default-with-nesting profile for apparmor

102. By Stéphane Graber on 2012-05-18

Remove lxc-ip and use 'ip netns' instead, fix some races in lxc-start-ephemeral and make it work when called without sudo

101. By Stéphane Graber on 2012-05-18

Simplify the Ubuntu template

100. By Serge Hallyn on 2012-05-16

[ Francesco Banconi ]
* Introduced lxc-ip: retrieve the ip addresses of a container.
* lxc-start-ephemeral: use lxc-ip to ssh to the container (LP: #994752).

99. By Serge Hallyn on 2012-05-10

* debian/control: add apparmor to lxc Depends (LP: #997681)
* debian/local/lxc-start-ephemeral: quote $line so its contents don't get
  expanded (LP: #997687)

98. By Serge Hallyn on 2012-05-07

* 0082-umount-old-proc: fix proc auto-mount. If /proc is already mounted,
  make sure that /proc/self points to 1, since we are container init.
  Otherwise, assume proc is an old one, and umount it and remount our own.
  If we keep the old proc mounted, apparmor transitions will by tried for
  wrong task and fail. Also move check for whether apparmor is enabled so
  that it is called by lxc-execute. (LP: #993706)
* update 0074-lxc-execute-find-init to look for lxc-init in
  LXCINITDIR/lxc/lxc-init
* debian/control: add cloud-utils to lxc Recommends, as lxc-ubuntu-cloud
  needs it. (LP: 995361)
* debian/lxc.upstart: load apparmor profiles before auto-starting containers.
  (LP: #989853)
* pop 06-bash.patch and 0075-lxc-ls-bash. lxc-clone also has bashims, just
  stick to using bash until upstream is also converted (so we are safe
  against patches).

97. By Stéphane Graber on 2012-05-04

Fix Ubuntu template to install the host architecture of the required
mutli-arch packages (when using qemu-user-static) instead of hardcoded
"amd64" version.

96. By Stéphane Graber on 2012-05-02

* Add support for quantal in lxc-ubuntu and lxc-ubuntucloud
* Drop support for maverick in lxc-ubuntu and lxc-ubuntucloud

95. By Serge Hallyn on 2012-05-02

lxc-clone: put quotes around $line to avoid expansion (LP: #993515)