[lxc-devel] Pull request bugfix branch

Stéphane Graber stgraber at ubuntu.com
Wed Oct 31 15:40:45 UTC 2012


The following changes since commit 60a742e0afd34e02299f64536df35116d68d888d:

  remove unused lastcap variable (2012-07-31 16:07:18 +0200)

are available in the git repository at:

  https://github.com/lxc/lxc.git upstream-bugfix

for you to fetch changes up to 773fb9cad76f43540fddb78c7ffef7237a51a06d:

  replace HOOK define with proper code. (2012-10-25 10:51:09 +0200)

----------------------------------------------------------------
Christian Seiler (1):
      lxc-ls: Scan cgroup mount points from fstype and not device

Dwight Engen (9):
      lxc-pkgconfig-dir
      lxc-doc-synopsis-args
      lxc-rpm-build
      fix expansion of LXCPATH,LXCROOTFSMOUNT,LXCTEMPLATEDIR
      Allow short -h and -n options to lxc-ps
      if the rootfs is a btrfs subvolume, delete it instead of rm -rf
      handle clone of btrfs snapshots
      display warning when yum missing in fedora template
      fix "make rpm"

Scott Moser (1):
      ubuntu-cloud template cleanups

Serge Hallyn (18):
      lxc-clone: change uuid on xfs
      lxc-clone: fix handling of lxc.mount entries
      Cleanup partial container if -h was passed to template
      ubuntu and debian templates: Clean up cache if cache build is
interrupted
      ubuntu template: apt-get clean after debootstrapping a cache
      lxc_start: exit early if insufficient privs in daemon mode
      lxc-ubuntu-cloud: get full pathname to userdata file
      add prototype for clone(2) as per manpage
      lxc-destroy: Separately rm rootfs if it is a symlink
      log errno when pclose fails
      lxc-clone: fix the '--name' parameter
      link /dev/kmsg to /dev/console in the container
      try to better handle out of date container caches.
      lxc-debian: specify isc-dhcp-server in package list
      lxc-ubuntu: fix printing of default user
      templates: mount devtmpfs in ubuntu containers
      revert devtmpfs in ubuntu templates
      replace HOOK define with proper code.

Stuart Yoder (1):
      busybox: for all lib dirs create mounts only if directories exist

Stéphane Graber (17):
      Fix lxc-ubuntu and lxc-ubuntu-cloud to properly deal with /dev/shm.
      Use lxc_putold as the pivot_root put dir in the ubuntu templates
      Don't update the host-name field in dhclient.conf when not hardcoded.
      Add lxc.aa_profile example to all templates
      When creating the lxc cgroup directory, ignore -EEXIST
      Make lxc-execute without rootfs work.
      sshd: run dhclient; allow adding a root ssh key
      Various fedora template improvements
      Add missing include for apparmor.h in conf.c
      Don't hardcode path to templates
      Add SIGINT and SIGPWR handler in lxc-debian
      Pass the container name to copy_configuration in lxc-lenny
      lxc-busybox: Use relative mounts in lxc.mount.entry
      lxc-ls: Use readlink on $directory
      lxc-debian: replace isc-dhcp-server by isc-dhcp-client
      lxc-ubuntu{-cloud}: Fix missing "fi" in new devtmpfs code
      Remove lxc-start-ephemeral from configure.ac

 Makefile.am                   |    2 +-
 configure.ac                  |    8 ++++----
 doc/lxc-attach.sgml.in        |   11 ++++++----
 doc/lxc-cgroup.sgml.in        |    7 ++++---
 doc/lxc-checkpoint.sgml.in    |    8 ++++----
 doc/lxc-console.sgml.in       |    8 ++++----
 doc/lxc-create.sgml.in        |   12 +++++------
 doc/lxc-destroy.sgml.in       |    7 +++----
 doc/lxc-execute.sgml.in       |   10 +++++-----
 doc/lxc-freeze.sgml.in        |    4 ++--
 doc/lxc-kill.sgml.in          |    4 +++-
 doc/lxc-ls.sgml.in            |    5 +++--
 doc/lxc-monitor.sgml.in       |    4 ++--
 doc/lxc-ps.sgml.in            |   14 ++++++-------
 doc/lxc-restart.sgml.in       |   11 +++++-----
 doc/lxc-shutdown.sgml.in      |    7 ++++---
 doc/lxc-start.sgml.in         |   16 +++++++++------
 doc/lxc-stop.sgml.in          |    4 ++--
 doc/lxc-unfreeze.sgml.in      |    4 ++--
 doc/lxc-wait.sgml.in          |    6 +++---
 lxc.spec.in                   |   16 ++++++++++-----
 src/lxc/cgroup.c              |    9 ++++++---
 src/lxc/conf.c                |   51
+++++++++++++++++++++++++++++++++++++++++++----
 src/lxc/conf.h                |    6 ------
 src/lxc/lxc-clone.in          |   34 +++++++++++++++++--------------
 src/lxc/lxc-create.in         |   14 +++++++++++--
 src/lxc/lxc-destroy.in        |   17 +++++++++++-----
 src/lxc/lxc-ls.in             |    5 ++---
 src/lxc/lxc-ps.in             |    4 ++--
 src/lxc/lxc-setcap.in         |    3 ---
 src/lxc/lxc-setuid.in         |    3 ---
 src/lxc/lxc_start.c           |   16 ++++++++++++---
 src/lxc/namespace.h           |    4 ++++
 src/lxc/start.c               |   15 ++++++++++----
 templates/lxc-altlinux.in     |    4 ++++
 templates/lxc-archlinux.in    |    4 ++++
 templates/lxc-busybox.in      |   30 ++++++++++++----------------
 templates/lxc-debian.in       |   19 +++++++++++++++++-
 templates/lxc-fedora.in       |   55
+++++++++++++++++++++++++++++++++++---------------
 templates/lxc-lenny.in        |    6 +++++-
 templates/lxc-opensuse.in     |    3 +++
 templates/lxc-sshd.in         |   48
++++++++++++++++++++++++++++++++++++++------
 templates/lxc-ubuntu-cloud.in |  144
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------
 templates/lxc-ubuntu.in       |   43
+++++++++++++++++++++++++++++----------
 44 files changed, 465 insertions(+), 240 deletions(-)

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com



-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 897 bytes
Desc: OpenPGP digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20121031/a6894306/attachment.pgp>


More information about the lxc-devel mailing list