[lxc-devel] [GIT] lxc branch, master, updated. e9831f83532184caa119f830eee54728084444ba
Daniel Lezcano
git at users.sourceforge.net
Sat Apr 6 17:54:32 UTC 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "lxc".
The branch, master has been updated
via e9831f83532184caa119f830eee54728084444ba (commit)
via d082b436af679d9dd9d6715c1a1def0726c6be82 (commit)
via 91f7ea5341ffabf81de1c308c62c6d9c9c3db459 (commit)
via 5a3d2e1efa652ed68d1125c688bb1b9b91889778 (commit)
via 6b5d5b974d447cf00ebfbdd3a0574463d849f943 (commit)
via 4bc8b18529e9f0ae86a004b14c2cb677701c51e5 (commit)
via 799f96fdd8fc9c0685fffee5998aab2287ebc25f (commit)
via 818fd9c7529fa22b16f214b4feedaa311497053f (commit)
via f3ca99fd5fe887adbb93ae56ccf629dfdd232070 (commit)
via bb787bc51f0a272f6574fe359f0749302e67c550 (commit)
via 488538117d44ebea9cb548c9b74ccf1a5e4d7551 (commit)
via f63b1efdb4a94019df15a2a52dce039025d94819 (commit)
via a0f379bfec4e341763ba7ed0099ce9cabaccd7c5 (commit)
via 8a63c0a9d9089e6365e5a696455476febed39d6a (commit)
via 9a42db48e0bcf4f34b05a3de1cda23e06f51d131 (commit)
via c13c0e08da7dbfecb52e85233ac6cd17afa5d818 (commit)
via 1fbb470b023351bb002f24325d07ded47f596c85 (commit)
via b3a39ba6bd4c3c3739006775ecef6207f9dcba31 (commit)
via 89d556d83a2eb9c6bbe424a7bb0556f59bb137dc (commit)
via 495c33c8e8329c06e64ce6fca54b9a02a384aba3 (commit)
via 7f145a6d0da7718efd4b260df162d2996811a508 (commit)
via d71d919efbd9b1e7d7b1c51ff9f809f94aedaff3 (commit)
via 675693a5d7f1dc4898a36114171a2815f87eb9bc (commit)
from 72280e1cd55e0fe3971f6fe2daa7b3e0cece56a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e9831f83532184caa119f830eee54728084444ba
Author: Daniel Lezcano <daniel.lezcano at free.fr>
Date: Fri Apr 5 11:47:48 2013 +0200
lxc-0.9.0
Signed-off-by: Daniel Lezcano <daniel.lezcano at free.fr>
commit d082b436af679d9dd9d6715c1a1def0726c6be82
Merge: 72280e1 91f7ea5
Author: Daniel Lezcano <daniel.lezcano at free.fr>
Date: Fri Apr 5 11:45:22 2013 +0200
Merge git://github.com/lxc/lxc
Signed-off-by: Daniel Lezcano <daniel.lezcano at free.fr>
commit 91f7ea5341ffabf81de1c308c62c6d9c9c3db459
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Mon Apr 1 14:19:36 2013 -0400
gitignore doc/legacy/lxc-ls.1
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit 5a3d2e1efa652ed68d1125c688bb1b9b91889778
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Mon Apr 1 10:36:29 2013 -0400
API shouldn't be calling create for already defined containers or destroy for non defined ones
Currently it always calls create/destroy which might be confusing for the code
that checks the return value of those calls to determine whether operation
completed successfully or not.
>>> c = lxc.Container("r")
>>> c.create("ubuntu")
True
>>> c.create("ubuntu")
True
>>> c.create("ubuntu")
True
>>> c.create("ubuntu")
True
>>> c.create("ubuntu")
>>> c.destroy()
True
>>> c.destroy()
lxc-destroy: 'r' does not exist
False
>>> c.destroy()
lxc-destroy: 'r' does not exist
False
New behaviour
>>> c = lxc.Container("r")
>>> c.create('ubuntu')
True
>>> c.create('ubuntu')
False
>>> c.destroy()
True
>>> c.destroy()
False
>>>
Tested with following script;
import lxc
c = lxc.Container("abcdef")
print ("set", c.set_config_item("lxc.utsname", "abcdef"))
print ("save", c.save_config())
print ("create", c.create("ubuntu"))
print ("create", c.create("ubuntu"))
print ("destroy", c.destroy())
print ("destroy", c.destroy())
print ("set", c.set_config_item("lxc.utsname", "abcdef"))
print ("save", c.save_config())
print ("destroy", c.destroy())
print ("destroy", c.destroy())
Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 6b5d5b974d447cf00ebfbdd3a0574463d849f943
Author: S.Çağlar Onur <caglar at 10ur.org>
Date: Sun Mar 31 23:37:09 2013 -0400
Make lxc.functions return the default lxcpath if /etc/lxc/lxc.conf doesn't provide one
Currently it returns the default path only if /etc/lxc/lxc.conf missing.
Since default lxc.conf doesn't contain lxcpath variable (this is at least the case in ubuntu) all tools fails if one doesn't give -P
caglar at qgq:~/Project/lxc/examples$ sudo /usr/bin/lxc-create -n test
lxc-create: no configuration path defined
Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 4bc8b18529e9f0ae86a004b14c2cb677701c51e5
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Sun Mar 31 17:00:10 2013 -0500
lxc-create: require absolute path for non-standard templates
Otherwise, as an example, if doing 'lxc-create -t debian' while
there is a 'debian' directory, lxc-create will fail to do the
right thing.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit 799f96fdd8fc9c0685fffee5998aab2287ebc25f
Author: Christian Seiler <christian at iwakd.de>
Date: Sat Mar 30 15:45:39 2013 +0100
lxc-attach: Implement --clear-env and --keep-env
This patch introduces the --clear-env and --keep-env options for
lxc-attach, that allows the user to specify whether the environment
should be passed on inside the container or not.
This is to be expanded upon in later versions, this patch only
introduces the most basic functionality.
Signed-off-by: Christian Seiler <christian at iwakd.de>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 818fd9c7529fa22b16f214b4feedaa311497053f
Author: Christian Seiler <christian at iwakd.de>
Date: Sat Mar 30 15:45:38 2013 +0100
lxc-shutdown: Make all processes exit before timeout if shutdown works
The following rationale is for using the -t option:
Currently, lxc-shutdown uses a subprocess for the timeout handling,
where a 'sleep $TIMEOUT' is executed, which will kill the main process
after the timeout has occurred, thus causing the main process to stop
the container hard with lxc-stop.
On the other hand, if the timeout is not reached, the main process
kills the subprocess. The trouble now is that if you kill a shell that
is running in the background, the kill will only take effect as soon as
the program currently running in the shell exits.
This in turn means that the subprocess will never terminate before
reaching the timeout. In an interactive shell, this does not matter,
since people will just not notice the process and lxc-shutdown returns
immediately. In a non-interactive enironment, however, there may be
circumstances that cause the calling program to wait until even that
subprocess is terminated, which means that shutdown will always take as
long as the timeout, even if the container shuts down quite a bit
earlier.
This change makes sure that also all subprocesses of the background
process are killed from the main process. This will immediately
terminate the background process, thus ensuring the desired behaviour.
Signed-off-by: Christian Seiler <christian at iwakd.de>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit f3ca99fd5fe887adbb93ae56ccf629dfdd232070
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Thu Mar 28 10:34:06 2013 -0500
rcfile shouldn't be recorded in lxc_conf if the attempt to load a config file fails
Though it's more subtle than that. If the file doesn't exist or we
can't access it, then don't record it. But if we have parse errors,
then do.
This is mainly to help out API users who try to read a container
configuration file before calling c->create(). If the file doesn't
exist, then without this patch the subsequent create() will not
use the default /etc/lxc/default.conf. The API user could check
for the file ahead of time, but this check makes his life easier
without costing us anything.
Signed-off-by: S.Çağlar Onur" <caglar at 10ur.org>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit bb787bc51f0a272f6574fe359f0749302e67c550
Author: Matthias Brugger <matthias.bgg at gmail.com>
Date: Wed Mar 27 22:21:28 2013 +0100
lxc.sgml.in: Fix typo in man page.
This patch fixes a small typo in the man page.
Signed-off-by: Matthias Brugger <matthias.bgg at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 488538117d44ebea9cb548c9b74ccf1a5e4d7551
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Wed Mar 27 09:01:44 2013 -0500
lxc-clone: support 'permanent ephemeral' containers
All of this needs a rewrite/redesign, and that will be coming (details
below), but for now
You can start 'non-ephemeral ephemeral' containers using
lxc-start-ephemeral -o oldname -n newname --keep-data
When you shut that down, the container stick around and can be
restarted. Now lxc-clone will recognize such a container by the
presence of the delta0/ which contains the read-write overlayfs
layer. This means you can do incremental development of containers,
i.e.
lxc-create -t ubuntu -n r1
lxc-start-ephemeral --keep-data -o r1 -n r1-2
# make some changes, poweroff
lxc-clone -o r1-2 -n r1-3
# make some changes...
lxc-clone -o r1-3 -n r1-4
# etc...
Now, as for design changes... from a higher level
1. lxc-clone should be re-written in c and exported through the
api.
2. lxc-clone should support overlayfs and aufs
3. lxc-start-ephemeral should become a thin layer which clones a
container, starts and stops and destroys it.
at a lower level,
1. the api should support container->setup_mounts
2. lxc-clone should be written as a set of backend classes which
can copy mounts to each other. So when you load a container
which is lvm-backed, it creates a lvm backend class. That
class instance can be converted into a loopback or qemu-nbd
or directory backed class. A directory-backed class can be
converted into a overlayfs or aufs backed class, which (a)
uses the dirctory-backed class as the read-only base, and (b)
pins the base container (so it can't be deleted until all
snapshots are deleted).
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit f63b1efdb4a94019df15a2a52dce039025d94819
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Wed Mar 27 09:27:43 2013 -0400
lxc-start-ephemeral: Implement -n to match manpage
The -n/--name option of lxc-start-ephemeral was never implemented
even though it was documented in the manpage.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit a0f379bfec4e341763ba7ed0099ce9cabaccd7c5
Author: David Ward <david.ward at ll.mit.edu>
Date: Tue Mar 26 21:27:52 2013 -0400
Set all mounts to MS_SLAVE when starting a container without a rootfs
If the filesystem mounts on the host have the MS_SHARED or MS_SLAVE
flag set, and a container without a rootfs is started, then any new
mounts created inside the container are currently propagated into
the host. In addition to mounts placed in the configuration file of
the container or performed manually after startup, the automatic
mounting of /proc by lxc-execute will propagate back into the host,
effectively crippling the entire system. This can be prevented by
setting the MS_SLAVE flag on all mounts (inside the container's own
mount namespace) during startup if a rootfs is not configured.
Signed-off-by: David Ward <david.ward at ll.mit.edu>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 8a63c0a9d9089e6365e5a696455476febed39d6a
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Tue Mar 26 17:18:54 2013 -0400
ubuntu: Tweak architecture support
This updates the various checks to match the grid below:
== lxc-ubuntu support per architecture ==
amd64: amd64, i386, armel, armhf, powerpc
i386: i386, armel, armhf, powerpc
armel: armel, armhf
armhf: armhf, armel
powerpc: powerpc
== lxc-ubuntu-cloud support per architecture ==
amd64: amd64, i386
i386: i386
armel: armel, armhf
armhf: armhf, armel
Note that most of the foreign architectures on x86 are supported
through the use of qemu-user-static. This one however isn't yet
support for cloud images (I'll send a patch for 1.0).
Also, qemu-user-static is technically able to emulate amd64 on i386
but qemu-debootstrap doesn't appear to know that and fails quite miserably.
We may also want to add a test for amd64 kernel but i386 userspace, which
is a valid combination that allows running an amd64 container on an i386
host without requiring emulation, but that's for another patch.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 9a42db48e0bcf4f34b05a3de1cda23e06f51d131
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Tue Mar 26 14:03:17 2013 -0400
Fix 'make clean'
This is mostly to make debuild happy as it doesn't tolerate any
leftover file when building twice in a row.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit c13c0e08da7dbfecb52e85233ac6cd17afa5d818
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Tue Mar 26 12:38:47 2013 -0400
EXTRA_DIST: Fix missing files with "make dist"
I recently noticed that the generated tarballs with "make dist"
were incomplete unless the configure script was run on a machine
with all possible build dependencies.
That's wrong as you clearly don't need those dependencies to generate
the tarball. This change fixes that.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 1fbb470b023351bb002f24325d07ded47f596c85
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Tue Mar 26 11:03:47 2013 -0400
python: Fix runtime failure on armhf
Recent testing on Ubuntu armhf showed that the python module was
failing to import. After some time tracking the issue down, the problem
was identified as being a non-terminated list of get/setters.
This commit fixes that issue as well as a few other potential ones that
were identified during debugging.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit b3a39ba6bd4c3c3739006775ecef6207f9dcba31
Author: David Ward <david.ward at ll.mit.edu>
Date: Wed Mar 20 12:08:29 2013 -0400
lxc-attach: Clear environment and set container=lxc
The child process's environment should be manipulated the same way
by lxc-attach as it would be by lxc-start or lxc-execute.
Signed-off-by: David Ward <david.ward at ll.mit.edu>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 89d556d83a2eb9c6bbe424a7bb0556f59bb137dc
Author: Ryota Ozaki <ozaki.ryota at gmail.com>
Date: Sun Mar 17 23:21:31 2013 +0900
Use $localstatedir/log/lxc for default log path
When we install lxc by manual (configure; make; make install),
all files are installed under /usr/local/. Configuration files
and setting files of containers are stored under /usr/local/ too,
however, only log files are stored under /var/log/ not
/usr/local/var/log.
This patch changes the default log path to $localstatedir/log/lxc
(by default $localstatedir is /usr/local/var) where is an ordinary
directory, which is probably expected and unsurprising.
Signed-off-by: Ryota Ozaki <ozaki.ryota at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 495c33c8e8329c06e64ce6fca54b9a02a384aba3
Author: Christian Seiler <christian at iwakd.de>
Date: Mon Mar 18 20:06:31 2013 +0100
Properly handle timeout case in lxc-shutdown
Signed-off-by: Christian Seiler <christian at iwakd.de>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 7f145a6d0da7718efd4b260df162d2996811a508
Author: Dennis Schridde <devurandom at gmx.net>
Date: Mon Mar 18 17:55:16 2013 +0100
Fix for ia64: Use __clone2 for ia64 in lxc/start.c
Signed-off-by: Dennis Schridde <devurandom at gmx.net>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit d71d919efbd9b1e7d7b1c51ff9f809f94aedaff3
Author: Christian Seiler <christian at iwakd.de>
Date: Mon Mar 18 20:06:30 2013 +0100
Properly cleanup network devices if pinning root filesystem didn't work
Signed-off-by: Christian Seiler <christian at iwakd.de>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
commit 675693a5d7f1dc4898a36114171a2815f87eb9bc
Author: Dennis Schridde <devurandom at gmx.net>
Date: Mon Mar 18 17:55:15 2013 +0100
Build fix for ia64: Declare __clone2 in lxc/namespace.h
Signed-off-by: Dennis Schridde <devurandom at gmx.net>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 ++
Makefile.am | 8 +++++++-
configure.ac | 4 ++--
doc/Makefile.am | 5 ++---
doc/examples/Makefile.am | 2 --
doc/lxc-attach.sgml.in | 33 +++++++++++++++++++++++++++++++++
doc/lxc.sgml.in | 2 +-
src/lua-lxc/Makefile.am | 5 ++++-
src/lxc/Makefile.am | 8 +++++---
src/lxc/attach.c | 30 ++++++++++++++++++++++++++++++
src/lxc/attach.h | 6 ++++++
src/lxc/conf.c | 7 ++++++-
src/lxc/confile.c | 3 +++
src/lxc/lxc-clone.in | 17 +++++++++++++++++
src/lxc/lxc-create.in | 2 +-
src/lxc/lxc-shutdown.in | 8 ++++++--
src/lxc/lxc-start-ephemeral.in | 11 ++++++++++-
src/lxc/lxc.functions.in | 8 ++++++--
src/lxc/lxc_attach.c | 25 ++++++++++++++++++++++++-
src/lxc/lxccontainer.c | 14 +++++++++++---
src/lxc/namespace.h | 6 +++++-
src/lxc/start.c | 9 +++++++--
src/python-lxc/Makefile.am | 9 ++++++---
src/python-lxc/lxc.c | 11 ++++++-----
templates/lxc-ubuntu-cloud.in | 26 +++++++++++++++++++++-----
templates/lxc-ubuntu.in | 15 +++++++++++++--
26 files changed, 234 insertions(+), 42 deletions(-)
delete mode 100644 RELEASE-NOTES
hooks/post-receive
--
lxc
More information about the lxc-devel
mailing list