lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201202110437

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/precise/lxc

Ubuntu branches: Pending requested 2012-02-11

Diff: 3940 lines (+3890/-0) (has conflicts)

8 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/0040-consoles-into-devlxc.patch/src/lxc/conf.c (+1767/-0)
.pc/0040-consoles-into-devlxc.patch/src/lxc/conf.h (+230/-0)
.pc/0040-consoles-into-devlxc.patch/src/lxc/confile.c (+898/-0)
.pc/0041-ubuntu-template-user-and-tty/templates/lxc-ubuntu.in (+595/-0)
debian/patches/0040-consoles-into-devlxc.patch (+278/-0)
debian/patches/0041-ubuntu-template-user-and-tty (+120/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

65. By Stéphane Graber on 2012-02-11

releasing version 0.7.5-3ubuntu24

64. By Stéphane Graber on 2012-02-11

update Ubuntu template to use devttydir, switch to using ubuntu/ubuntu and sudo by default instead of root/root, move information message about default username/password to the end of the template creation.

63. By Stéphane Graber on 2012-02-11

Add patch from Serge to support devttydir as a prefix for /dev/console and /dev/tty[1234].

62. By Serge Hallyn on 2012-02-10

* debian/lxc.upstart, debian/lxc.lxc-net.upstart, and debian/rules:
  Upstartify lxc.
* remove debian/lxc.init

61. By Serge Hallyn on 2012-02-09

* debian/lxc.init:
  - at setup_lxc_bridge, return early if ${LXC_BRIDGE) already exists.
    (LP: #929514)
  - switch 'ip link show' and 'brctl show' checks for /sys/class/net lookups.
  - try to prevent destroying host network setup if /etc/default/lxc is
    bad. Set defaults for lxc network variables if unset.
  - don't pass along variables as arguments if not needed.

60. By Martin Pitt on 2012-02-09

debian/lxc.init: Exit cleanly in undo_network(), to avoid the init.d
script and thus the package installation to fail if the network could not
be configured for LXC. (LP: #929382)

59. By Serge Hallyn on 2012-02-08

* Remove lxcguest package. No longer needed in precise.
* ubuntu-cloud template: by default assume non-cloud environment, unless
  '-- -C' option is given. Otherwise containers started in a private
  environment won't create ssh keys, etc.
* 0039-no-lxcguest-in-p-template: don't install the lxcguest package if
  we are creating a precise (or higher) container.

58. By Serge Hallyn on 2012-02-07

* 0036-fix-reboot-detection - actually detect when our kernel supports
  container reboot.
* 0037-silence-netstat-errors-in-lxcls - silence netstat warnings in
  lxc-ls
* 0038-ubuntu-cloud-template - add a template to create containers based
  on the ubuntu cloud images.

57. By Serge Hallyn on 2012-02-06

* lxcguest.lxcguest.upstart: emit the net-device-up IFACE=lo event, so
  that any upstart jobs waiting on it (esp rc-sysinit before oneiric) will
  proceed. (LP: #924337)
* 0034-fix-lxc-execute-reboot.patch: fix bad handling of 'exit 0' for
  lxc-execute introduced with the container reboot handling. (LP: #927863)
* debian/lxcguest.lxcmount.upstart: add '--no-wait' to emit to make sure we
  don't wait for the event to be processed.
* 0035-lxc-init-ignore-shm.patch: if lxc-init can't mount /dev/shm, don't
  fail on account of that. (LP: #927883)
* debian/lxc.init: if the network is already up, exit before setting the
  trap EXIT.

56. By Stéphane Graber on 2012-02-02

[ Serge Hallyn ]
* 0032-start-check-caps.patch: exit early and with a clear error message
  if lxc-start is run with insufficient permissions. (LP: #925520)
* debian/lxc.init: if there is a failure during lxc network setup, clean
  up and exit. (LP: #925511)

[ Stéphane Graber ]
* 0033-ubuntu-template-multiarch.patch: Add support for building
  containers using qemu-user-static, using multi-arch to install some
  packages of the host architecture so the container boots and works.
* Add qemu-user-static as a Suggest of lxc.