[lxc-devel] [GIT] lxc branch, master, updated. 7f99e339363d9f005c9386f60a1d8c0953c85053
Daniel Lezcano
git at users.sourceforge.net
Wed Oct 31 15:45:30 UTC 2012
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 7f99e339363d9f005c9386f60a1d8c0953c85053 (commit)
via 773fb9cad76f43540fddb78c7ffef7237a51a06d (commit)
via 8215fe8e4186ebe8cb79fe4b773f5bcffcdc723b (commit)
via 192df6e2eb8ebb1a337c7ba025c57852d38e0d26 (commit)
via c215bff6dfc298bdd6150e11b8c0f76c9d013a0a (commit)
via 0b53175846e704fc4dd4cf8b4590a86db63e50e6 (commit)
via a1bd64823cd5e5afc53ba24940a51151e34b8103 (commit)
via bf7d76cf3ae180820c0a29e0bfbaa97c20ce6a3d (commit)
via d4eb4ab1290def213396611f5946ef3b7f0d83ef (commit)
via 5ae26abb52046b6f21afa06bcbac221c3cf8f1c0 (commit)
via 06a1e1db99844b95e21c3b67964974f9032720ea (commit)
via 3b9bad3d638ea442bfe6ba7e677cd5c6d39c0916 (commit)
via c12e775237976bc0c1cf8afdc7aa766de46d3d40 (commit)
via c6ed4d048deea85ed3bec67c7a04fb6c97009321 (commit)
via 3f16e26c7063f5004cafe4cfd6d084b7e4d08d1f (commit)
via 91a5df88ad29bcbc485baa51eacf0b851c6f4834 (commit)
via 1bd051a6b0a34cb2b2e80584b9fb4643abf1a827 (commit)
via 5d38621d0bb9b398393806b875d612a05e76c06e (commit)
via 8aba484aeaccda2881300ff80e9d7dfaaa842b40 (commit)
via 5d01f6167c2354637e777650558be6d7d69e2579 (commit)
via 6bc424b5c7c8130ffdb6390eae53b32370a755f8 (commit)
via d595c68add4ef33cf273c455238b018729de00a5 (commit)
via b9cb4325d74fb01dc4e71adc211e7e7052471778 (commit)
via b4578c5b380130a41a69b5b49c970157acaf1dbb (commit)
via b97b78abdac34fabcbbf64ba49ec8c78939124b4 (commit)
via 87af3ecd48587775970c0ca731d50183bd24017e (commit)
via 435d40f7e3dc5b99a5fcbc459f79ba6b04238502 (commit)
via 6bf8daf9a2aa0d226bfd5b60c4b1580d17105320 (commit)
via 70542ef9a1d09ce87c7d40ac5ea1706860edec74 (commit)
via 55116c42e767ce795f796fc51cd2ef7d76cf18af (commit)
via b942e67226af9e690bd63ac440b99aedb6becbb3 (commit)
via fbef4590b7b7186890a7d0cb8be0af2780a2df5f (commit)
via d0a36f2c8b2f41399ae709280cd8b4a2f3bb0165 (commit)
via cb26f1a5eee13afe1a561ebf57245cb8629797b9 (commit)
via 337e14712e2bf568db73dd57c709b3364e26d798 (commit)
via 9ac3ffb51777ee48ffbd42ff3625f63dfe948837 (commit)
via 10f73bfa4aece7707f48379b82e5858d1909d98f (commit)
via e7f40d8aaba2c17b8ccb323b5df20a423ef5d0a0 (commit)
via f02ce27d4b1a9d01b88d0ffaf626e5bafa671bf0 (commit)
via 33f3de4eaaa4e2084ea6e3695e29da5b736f1095 (commit)
via e470cba076535e4e9732173e0e314e473165478c (commit)
via 542939c31bb73bab55f2fd71243b98f5559597d1 (commit)
via b4df0a1eda252bb7efbd4d7453e9e8a57143c528 (commit)
via 06f5c6328b73aad7b138096295357d803db26efa (commit)
via f1ccde27c038e7fb7e538913505248b36ddd9e65 (commit)
via 4a311c1241805dac5893918854fd40f77b2b6f49 (commit)
via 4d5fb23ad827eda17b64676f527c3f168cd56ebd (commit)
via 8b892c55b077d1716eb130e76f9c9725ecb0f73a (commit)
from 60a742e0afd34e02299f64536df35116d68d888d (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 7f99e339363d9f005c9386f60a1d8c0953c85053
Merge: 60a742e 773fb9c
Author: Daniel Lezcano <daniel.lezcano at free.fr>
Date: Wed Oct 31 16:39:50 2012 +0100
Merge branch 'upstream-bugfix' of https://github.com/lxc/lxc
* 'upstream-bugfix' of https://github.com/lxc/lxc: (47 commits)
replace HOOK define with proper code.
Remove lxc-start-ephemeral from configure.ac
revert devtmpfs in ubuntu templates
lxc-ubuntu{-cloud}: Fix missing "fi" in new devtmpfs code
fix "make rpm"
display warning when yum missing in fedora template
templates: mount devtmpfs in ubuntu containers
handle clone of btrfs snapshots
if the rootfs is a btrfs subvolume, delete it instead of rm -rf
lxc-debian: replace isc-dhcp-server by isc-dhcp-client
lxc-ls: Scan cgroup mount points from fstype and not device
Allow short -h and -n options to lxc-ps
lxc-ubuntu: fix printing of default user
lxc-debian: specify isc-dhcp-server in package list
try to better handle out of date container caches.
link /dev/kmsg to /dev/console in the container
lxc-clone: fix the '--name' parameter
lxc-ls: Use readlink on $directory
lxc-busybox: Use relative mounts in lxc.mount.entry
busybox: for all lib dirs create mounts only if directories exist
...
Signed-off-by: Daniel Lezcano <dlezcano at fr.ibm.com>
commit 773fb9cad76f43540fddb78c7ffef7237a51a06d
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Tue Sep 4 13:57:39 2012 -0500
replace HOOK define with proper code.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 8215fe8e4186ebe8cb79fe4b773f5bcffcdc723b
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Thu Oct 25 10:43:59 2012 +0200
Remove lxc-start-ephemeral from configure.ac
lxc-start-ephemeral.in ended up in configure.ac as a result of the
cherry-pick. This new tool hasn't been pulled in yet.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit 192df6e2eb8ebb1a337c7ba025c57852d38e0d26
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Wed Oct 24 11:05:38 2012 -0500
revert devtmpfs in ubuntu templates
devtmpfs is shared between host and containers, and it messes up
lucid containers too.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit c215bff6dfc298bdd6150e11b8c0f76c9d013a0a
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Wed Oct 24 13:05:03 2012 +0200
lxc-ubuntu{-cloud}: Fix missing "fi" in new devtmpfs code
The "if" statement to add devtmpfs was missing a matching "fi" causing parsing
error when using the template.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit 0b53175846e704fc4dd4cf8b4590a86db63e50e6
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Thu Oct 4 12:28:38 2012 -0400
fix "make rpm"
RPM doesn't like "-" in the version number and gives:
"error: line 24: Illegal char '-' in: Version: 0.8.0-rc2"
Other packages (bind-utils for example) have used . instead
of - as a seperator.
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit a1bd64823cd5e5afc53ba24940a51151e34b8103
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Thu Oct 4 13:12:41 2012 -0400
display warning when yum missing in fedora template
This early exit is preventing the warning message that follows it from
being shown.
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
commit bf7d76cf3ae180820c0a29e0bfbaa97c20ce6a3d
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Thu Oct 4 13:54:00 2012 -0500
templates: mount devtmpfs in ubuntu containers
That way /dev/disk/ exists, and update-grub can succeed.
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1060404
commit d4eb4ab1290def213396611f5946ef3b7f0d83ef
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Wed Sep 26 13:20:30 2012 -0400
handle clone of btrfs snapshots
Fix determination of $oldroot from the config file. The old code had the '
in the wrong place and didn't account for whitespace between the = and
the rootfs.
Set $rootfs based on $oldroot instead of forcing it to be in
$lxc_path/$lxc_new/rootfs. This allows for btrfs snapshot to be made even if
$lxc_path isn't on the same filesystem. If $oldroot isn't a subvolume,
fall back to making a copy.
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
commit 5ae26abb52046b6f21afa06bcbac221c3cf8f1c0
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Wed Sep 26 12:59:28 2012 -0400
if the rootfs is a btrfs subvolume, delete it instead of rm -rf
Check if the rootfs is btrfs subvolume, and if so delete it. Otherwise
fall back to the rm -rf.
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
commit 06a1e1db99844b95e21c3b67964974f9032720ea
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Mon Sep 24 15:16:25 2012 -0400
lxc-debian: replace isc-dhcp-server by isc-dhcp-client
The DHCP client should be isc-dhcp-client, not isc-dhcp-server.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit 3b9bad3d638ea442bfe6ba7e677cd5c6d39c0916
Author: Christian Seiler <christian at iwakd.de>
Date: Mon Sep 24 11:21:48 2012 +0200
lxc-ls: Scan cgroup mount points from fstype and not device
lxc-ls --active now scans mount points that have the 'cgroup' filesystem
type and not the 'cgroup' device name (which is ignored anyway and may be
anything).
Signed-off-by: Christian Seiler <christian at iwakd.de>
Cc: Serge Hallyn <serge.hallyn at ubuntu.com>
commit c12e775237976bc0c1cf8afdc7aa766de46d3d40
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Tue Sep 18 15:58:17 2012 -0400
Allow short -h and -n options to lxc-ps
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
commit c6ed4d048deea85ed3bec67c7a04fb6c97009321
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Wed Sep 19 12:15:51 2012 -0500
lxc-ubuntu: fix printing of default user
If a user is bound into the container, don't claim the default user is
ubuntu.
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1052315
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 3f16e26c7063f5004cafe4cfd6d084b7e4d08d1f
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Wed Sep 19 12:14:58 2012 -0500
lxc-debian: specify isc-dhcp-server in package list
dhcp3-client does not exist in testing.
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1052972
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 91a5df88ad29bcbc485baa51eacf0b851c6f4834
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Fri Sep 14 14:43:45 2012 -0500
try to better handle out of date container caches.
For a lucid container, apt-get update before installing the source package for
add-apt-repository, so that apt-get does not fail.
If apt-get dist-upgrade fails, suggest running lxc-create with -F.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 1bd051a6b0a34cb2b2e80584b9fb4643abf1a827
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Thu Sep 13 09:39:07 2012 -0500
link /dev/kmsg to /dev/console in the container
This way init log messages can be seen on the console. If containerized
syslog ever comes around, we can get rid of this.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 5d38621d0bb9b398393806b875d612a05e76c06e
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Thu Sep 13 09:38:11 2012 -0500
lxc-clone: fix the '--name' parameter
The long opt for --name was being incorrectly compared to --new.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 8aba484aeaccda2881300ff80e9d7dfaaa842b40
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Wed Sep 12 18:21:00 2012 -0400
lxc-ls: Use readlink on $directory
lxc-ls was failing in cases where $directory is a symlink to another
directory. Instead have $directory be generated from the output of
readlink -f "$lxc_path".
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit 5d01f6167c2354637e777650558be6d7d69e2579
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Wed Sep 12 15:22:15 2012 -0400
lxc-busybox: Use relative mounts in lxc.mount.entry
To make it easier to clone/rename the container, replace hardcoded
entries (with rootfs in the destination path) by rootfs-relative entries.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit 6bc424b5c7c8130ffdb6390eae53b32370a755f8
Author: Stuart Yoder <stuart.yoder at freescale.com>
Date: Wed Sep 12 13:15:12 2012 -0500
busybox: for all lib dirs create mounts only if directories exist
Signed-off-by: Stuart Yoder <stuart.yoder at freescale.com>
commit d595c68add4ef33cf273c455238b018729de00a5
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Tue Sep 11 17:06:05 2012 -0400
fix expansion of LXCPATH,LXCROOTFSMOUNT,LXCTEMPLATEDIR
These variables are not expanded correctly in doc/lxc-create.sgml.in
and a workaround is in place to ensure ${localstatedir}, and ${datadir}
are set in the various shell scripts that use it. There is no workaround
to ensure ${datadir} is set in src/lxc/lxc-create.in, nor is
${localstatedir} set in templates/lxc-altlinux.in so I think that these
are currently broken.
Using AS_AC_EXPAND instead of AC_SUBST fixes these problems and removes
the need for the workarounds. In addition the lxc-start-ephemeral.in
script can be autoconf'ed instead of sed'ed by the makefile.
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
commit b9cb4325d74fb01dc4e71adc211e7e7052471778
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Tue Sep 11 14:30:22 2012 -0400
lxc-rpm-build
Fix building of rpm by non-root user. Include templates in rpm, fix rpm path of
lxc-init.
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
commit b4578c5b380130a41a69b5b49c970157acaf1dbb
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Mon Sep 10 16:49:31 2012 -0400
lxc-doc-synopsis-args
I was getting raw nroff ".SH DESCRIPTION" in my man pages. This fixes
the synopsis cmd args so that doesn't happen. Added replaceable to a few
arguments.
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
commit b97b78abdac34fabcbbf64ba49ec8c78939124b4
Author: Dwight Engen <dwight.engen at oracle.com>
Date: Mon Sep 10 10:28:37 2012 -0400
lxc-pkgconfig-dir
Put pkg-config .pc file in libdir.
Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
commit 87af3ecd48587775970c0ca731d50183bd24017e
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Thu Sep 6 22:16:55 2012 -0500
log errno when pclose fails
When lxc is executing a script and pclose fails, log the
errno to help debug what happened.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 435d40f7e3dc5b99a5fcbc459f79ba6b04238502
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Thu Sep 6 10:59:57 2012 -0400
Pass the container name to copy_configuration in lxc-lenny
This fixes a case where lxc.utsname would be set empty as copy_configuration
wasn't getting the container name.
Signed-off-by: Rex Tsai (蔡志展) <rex.tsai at canonical.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit 6bf8daf9a2aa0d226bfd5b60c4b1580d17105320
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Thu Sep 6 10:57:20 2012 -0400
Add SIGINT and SIGPWR handler in lxc-debian
This adds a SIGINIT and SIGPWR handler in the default inittab for
the Debian template. This allows lxc-shutdown/lxc-restart and their API calls
to properly shutdown or reboot the container.
Signed-off-by: Rex Tsai (蔡志展) <rex.tsai at canonical.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit 70542ef9a1d09ce87c7d40ac5ea1706860edec74
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Wed Sep 5 23:54:51 2012 -0400
Don't hardcode path to templates
configure.ac used to set the template path to /usr/share/lxc/templates.
Instead use ${datadir} to make it follow ${prefix}.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit 55116c42e767ce795f796fc51cd2ef7d76cf18af
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Wed Sep 5 21:59:13 2012 -0500
lxc-destroy: Separately rm rootfs if it is a symlink
If rootfs is a symbolic link but not to a block device, then do a separate
rm of its contents. We have to do this because, out of cowardice, we call
rm with --one-filesystem.
Removing the '-o -h $rootdev' is ok, because if $rootdev is a symbolic
link to a block device (including lvm blockdev) then -b will still return
true.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit b942e67226af9e690bd63ac440b99aedb6becbb3
Author: Scott Moser <smoser at ubuntu.com>
Date: Tue Sep 4 15:44:25 2012 -0500
ubuntu-cloud template cleanups
Fix for quantal images which do not have the user 'ubuntu' present.
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1045955
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit fbef4590b7b7186890a7d0cb8be0af2780a2df5f
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Tue Sep 4 14:06:29 2012 -0500
add prototype for clone(2) as per manpage
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit d0a36f2c8b2f41399ae709280cd8b4a2f3bb0165
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Sat Sep 1 20:15:31 2012 -0400
Add missing include for apparmor.h in conf.c
This include is conditional on apparmor being selected.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit cb26f1a5eee13afe1a561ebf57245cb8629797b9
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Fri Aug 31 09:17:38 2012 -0700
Various fedora template improvements
1. don't add network segment to config
2. check for 'curl'
3. don't add $name to $path, it's already in there
4. don't add devpts to fstab, that's wrong.
5. $UTSNAME doesn't exist
6. set root pwd to root instead of rooter.
7. install fedora-release package.
8. add a console on /dev/console.
9. create empty fstab
10. don't mount devpts in rc.sysinit.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit 337e14712e2bf568db73dd57c709b3364e26d798
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Fri Aug 31 09:09:34 2012 -0700
sshd: run dhclient; allow adding a root ssh key
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit 9ac3ffb51777ee48ffbd42ff3625f63dfe948837
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Fri Aug 31 08:58:56 2012 -0700
Make lxc-execute without rootfs work.
That means, don't try to pin a null rootfs, and don't try to mount /proc
since /var/lib/lxc/root/proc doesn't exist to be mounted onto.
The apparmor patches are not yet upstream, so this patch will not go
upstream by itself.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit 10f73bfa4aece7707f48379b82e5858d1909d98f
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Thu Aug 30 11:02:24 2012 -0500
lxc-ubuntu-cloud: get full pathname to userdata file
When passing '--userdata somefile' to the ubuntu-cloud template, a user
may pass a relative pathname. The template uses the filename after
changing current directory, so store the full pathname for the userdata
file instead of a potential relative pathname.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit e7f40d8aaba2c17b8ccb323b5df20a423ef5d0a0
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Wed Aug 29 14:42:59 2012 -0700
When creating the lxc cgroup directory, ignore -EEXIST
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com
commit f02ce27d4b1a9d01b88d0ffaf626e5bafa671bf0
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Wed Aug 29 09:27:53 2012 -0700
Add lxc.aa_profile example to all templates
LXC has optional apparmor support, default profile is lxc-container-default.
This change adds a commented "lxc.aa_profile = default" line to all templates,
uncommenting this will bypass apparmor for the container.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit 33f3de4eaaa4e2084ea6e3695e29da5b736f1095
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Wed Aug 29 13:51:37 2012 -0700
Don't update the host-name field in dhclient.conf when not hardcoded.
On Debian and Ubuntu, the default host-name field in dhclient.conf is
set to either "<hostname>" or "gethostname()" both of which get replaced
by the machine's hostname at query time.
The sed call currently present in lxc-clone hardcodes the hostname in
dhclient.conf, causing dpkg to prompt on isc-dhcp updates.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit e470cba076535e4e9732173e0e314e473165478c
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Tue Aug 28 13:46:59 2012 -0400
Use lxc_putold as the pivot_root put dir in the ubuntu templates
By default we use mnt, but that means that lxc fstab entries do not work
when placed under the container's /mnt/.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
commit 542939c31bb73bab55f2fd71243b98f5559597d1
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: Tue Aug 28 13:42:27 2012 -0400
Fix lxc-ubuntu and lxc-ubuntu-cloud to properly deal with /dev/shm.
Now that initscripts in Debian and Ubuntu has been updated to no longer
do silly things with /dev/shm and /run/shm on installation/update, the
check needs updating to detect any remaining broken case and fix it.
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
commit b4df0a1eda252bb7efbd4d7453e9e8a57143c528
Author: Serge Hallyn <serge.halyn at ubuntu.com>
Date: Tue Aug 21 10:05:19 2012 -0500
lxc_start: exit early if insufficient privs in daemon mode
Starting a container with insufficient privilege (correctly) fails
during lxc_init. However, if starting a daemonized container, we
daemonize before we get to that check. Therefore while the
container will fail to start, and the logfile will show this, the
'lxc-start -n x -d' command will return success. For ease of
scripting, do a check for the required privilege before we exit.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 06f5c6328b73aad7b138096295357d803db26efa
Author: Serge Hallyn <serge.halyn at ubuntu.com>
Date: Tue Aug 21 09:59:43 2012 -0500
ubuntu template: apt-get clean after debootstrapping a cache
This saves quite a bit of space in the cache and containers.
See https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1037626 for the
original bug report.
Reported-by: Fajar A. Nugraha <list at fajar.net>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit f1ccde27c038e7fb7e538913505248b36ddd9e65
Author: Serge Hallyn <serge.halyn at ubuntu.com>
Date: Tue Aug 21 09:56:03 2012 -0500
ubuntu and debian templates: Clean up cache if cache build is interrupted
Otherwise the next lxc-create may rsync a bad cache.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 4a311c1241805dac5893918854fd40f77b2b6f49
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Thu Aug 16 21:11:50 2012 -0500
Cleanup partial container if -h was passed to template
If user calls 'lxc-create -t ubuntu -- -h' (as opposed to
'lxc-create -t ubuntu -h') then the ubuntu template will print its
help then exit 0. Then lxc-create does not cleanup. So detect this
in lxc-create.
commit 4d5fb23ad827eda17b64676f527c3f168cd56ebd
Author: Serge Hallyn <serge at amd1.(none)>
Date: Fri Jul 20 10:38:15 2012 -0500
lxc-clone: fix handling of lxc.mount entries
The 'lxc.mount =' entry can have more than one space, or tabs, before the =.
We only need to disambiguate from 'lxc.mount.entry'. So just check for a
space or tab after mount.
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
commit 8b892c55b077d1716eb130e76f9c9725ecb0f73a
Author: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Thu Jul 19 17:54:54 2012 -0500
lxc-clone: change uuid on xfs
Otherwise after cloning an lvm+xfs container you can't run the
original and clone at the same time.
Based on a patch by Maurizio Sambati posted at
https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/1013549
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
-----------------------------------------------------------------------
Summary of changes:
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(-)
hooks/post-receive
--
lxc
More information about the lxc-devel
mailing list