Commit Graph

3762 Commits

Author SHA1 Message Date
Stéphane Graber
ab5723672b Merge pull request #670 from ksperis/master
Add Ceph RBD backingstore.
2015-12-15 00:36:02 -05:00
Laurent Barbe
93068560df Fix mkdir error if it already exist
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2015-12-13 22:35:43 +01:00
Laurent Barbe
7ed52ec63c Fix API break on bdev_specs
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2015-12-13 22:35:43 +01:00
Laurent Barbe
a237da92a0 Fix alloca size in rbd_destroy
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2015-12-13 22:35:43 +01:00
Laurent Barbe
60656b379b doc: Add 'rbd' to the parameter of backingstore in lxc-create(1)
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2015-12-13 22:35:43 +01:00
Laurent Barbe
7da812df93 Add Ceph RBD backingstore
With lxc-create, this will create, map and mount a Rados blockdevice.
A valid ceph.conf and ceph.client.admin.keyring is needed in /etc/ceph/
RBD mapping is not manage on reboot.

Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2015-12-13 22:35:43 +01:00
Li Qiu
40f2f8a23e Return immediately in save_phys_nics if not run as root
Physical nic is not instantiated in lxc_create_network

Signed-off-by: Li Qiu <li.qiu@nomovok.com>
2015-12-11 08:24:12 +02:00
Christian Brauner
c261392712 Add concise explanations
- explain functions in list.h
- let lxc_list_len() return size_t instead of int

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-11 01:17:53 -05:00
Stéphane Graber
e08ad7ca7e
Add lxc-copy to gitignore
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-11 01:14:34 -05:00
Stéphane Graber
bd7b4e282b Fix seccomp profile on attach of undefined container
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
2015-12-11 01:14:18 -05:00
Stéphane Graber
d86eb75c05 Merge pull request #717 from fanyeren/patch-4
lxc-top: limit BLKIO to 14 characters
2015-12-11 01:09:22 -05:00
fanyeren
c78aa2c625 lxc-top: limit BLKIO to 14 characters
limit BLKIO columns to 10 characters is too small,i think 14 is a better value

Signed-off-by: feng xiahou xiahoufeng@yahoo.com
2015-12-11 13:56:24 +08:00
Stéphane Graber
9d7de2fb27 Merge pull request #716 from fanyeren/patch-15
lxc-top: limit CPU to 8 characters
2015-12-11 00:32:14 -05:00
fanyeren
51fdb0fba2 lxc-top: limit CPU to 8 characters
limit CPU columns to 8 characters is too small,i think 12 is a better value
2015-12-11 13:25:52 +08:00
Andrey Jr. Melnikov
9bfdc2235c Add LUA api get_ips(), get_interfaces(), rename() functions
Signed-off-by: Andrey Jr. Melnikov <temnota.am@gmail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-10 13:08:11 -05:00
Stéphane Graber
6a5640665c Update get_item test after the lxc.mount.entry fix
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 23:54:28 -05:00
Stéphane Graber
33ae222cf9 Merge pull request #710 from hnakamur/improve_lxc_copy_japanese_manpage
Improve the lxc-copy Japanese manpage
2015-12-09 23:03:31 -05:00
Serge Hallyn
a7c6b8c7b7 fix 'lxc.mount.entry' key when clearing unexpanded config
Closes #712

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-09 23:01:21 -05:00
Tycho Andersen
f8a41688ec c/r: add more logging when restore fails
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 23:00:26 -05:00
Tycho Andersen
e9195050b4 c/r: escape cgroups before exec()ing criu
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 23:00:23 -05:00
Tycho Andersen
06078509e3 cgroup: add cgroup_escape() call
We'll use this in the next patch to escape to the root cgroup before we
exec criu.

v2: s/cgm_connected/cmg_needs_disconnect/g

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 23:00:21 -05:00
Sungbae Yoo
ba3004da53 Add LXC_TARGET env to Korean lxc.container.conf(5)
Update for commit c154af9

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-09 22:59:08 -05:00
TAMUKI Shoichi
af2d9fad6e Add support for new target plamo to configure.ac
Add support for new target plamo to specify the linux distribution.
Plamo Linux uses sysvinit.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Signed-off-by: TAMUKI Shoichi <tamuki@linet.gr.jp>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 22:57:06 -05:00
TAMUKI Shoichi
cdcae1034c Fold dnsmasq command line in lxc-net.in
Fold dnsmasq command line at about 80 chars because the line is too
long.

Signed-off-by: TAMUKI Shoichi <tamuki@linet.gr.jp>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 22:56:59 -05:00
Tycho Andersen
fa07124900 c/r: remove random line continuations
No idea how these got there, but let's get rid of them since they're weird.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 22:56:52 -05:00
Tycho Andersen
aef3d51e61 c/r: add a new ->migrate API call
This patch adds a new ->migrate API call with three commands:

MIGRATE_DUMP: this is basically just ->checkpoint()
MIGRATE_RESTORE: this is just ->restore()
MIGRATE_PRE_DUMP: this can be used to invoke criu's pre-dump command on the
    container.

A small addition to the (pre-)dump commands is the ability to specify a
previous partial dump directory, so that one can use a pre-dump of a
container.

Finally, this new API call uses a structure to pass options so that it can
be easily extended in the future (e.g. to CRIU's --leave-frozen option in
the future, for potentially smarter failure handling on restore).

v2: remember to flip the return code for legacy ->checkpoint and ->restore
    calls

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 22:53:59 -05:00
Tycho Andersen
6bf5b3da1e c/r: bump criu version requirements
Since we're relying on 1.8 for the seccomp stuff, let's refuse to use
anything lower than that.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 22:53:34 -05:00
Tycho Andersen
8164f0e253 api wrapper: only reset the current config if this call set it
Instead of *always* resetting the current_config to null, we should only
reset it if this API call set it.

This allows nesting of API calls, e.g. c->checkpoint() can pass stuff into
criu.c, which can call c->init_pid() and not lose the ability to log stuff
afterwards.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-09 22:53:31 -05:00
Serge Hallyn
23820d548d prune_init_cgroup: don't dereference NULL
This is to avoid:

https://errors.ubuntu.com/problem/d640a68bf7343705899d7ca8c6bc070d477cd845

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-12-07 10:14:40 -06:00
Hiroaki Nakamura
988247d5ad Improve the lxc-copy Japanese manpage
Signed-off-by: Hiroaki Nakamura <hnakamur@gmail.com>
2015-12-05 01:08:22 +09:00
KATOH Yasufumi
86b484e979 doc: Add lxc.monitor.unshare to lxc.container.conf(5)
Update for commit a8dfe4e and 6039eaa

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 13:53:38 -05:00
KATOH Yasufumi
3c08e89391 Add LXC_TARGET env to Japanese lxc.container.conf(5)
Update for commit c154af9

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 13:53:36 -05:00
KATOH Yasufumi
842948e416 doc: Add Japanese manpage for lxc-copy
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 13:53:34 -05:00
Christian Brauner
ca3995947f Conditional compilation for ARM and PPC
Check if symbols SCMP_ARCH_ARM and SCMP_ARCH_PPC are defined.

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 13:52:29 -05:00
Serge Hallyn
7635139aa8 seccomp: support 32-bit arm on arm64, and 32-bit ppc on ppc64
Generally we enforce that a [arch] seccomp section can only be used on [arch].
However, on amd64 we allow [i386] sections for i386 containers, and there we
also take [all] sections and apply them for both 32- and 64-bit.

Do that also for ppc64 and arm64.  This allows seccomp-protected armhf
containers to run on arm64.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 01:15:40 -05:00
Serge Hallyn
480c876b20 apparmor: support lxc.aa_profile = unchanged
In which case lxc will not update the apparmor profile at all.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 01:14:37 -05:00
Sungbae Yoo
b035f79209 doc: Add Korean manpage for lxc-copy
Update for commit 2b47bac

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 01:14:34 -05:00
fli
f2e206ff47 lxc: let lxc-start support wlan phys
The commit: e5848d395c <netdev_move_by_index: support wlan> only
made netdev_move_by_name support wlan, instead of netdev_move_by_index.

Given netdev_move_by_name is a wrapper of netdev_move_by_index, so here
replacing all of the call to lxc_netdev_move_by_index with lxc_netdev_move_by_name
to let lxc-start support wlan phys.

Signed-off-by: fupan li <fupan.li@windriver.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 01:14:15 -05:00
Wolfgang Bumiller
6039eaa236 doc: lxc.monitor.unshare requires CAP_SYS_ADMIN
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 01:14:11 -05:00
Wolfgang Bumiller
a8dfe4e08d Added lxc.monitor.unshare
If manual mounting with elevated permissions is required
this can currently only be done in pre-start hooks or before
starting LXC. In both cases the mounts would appear in the
host's namespace.
With this flag the namespace is unshared before the startup
sequence, so that mounts performed in the pre-start hook
don't show up on the host.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 01:14:08 -05:00
Tycho Andersen
d16ccca80f log: use the right size for timestamp formatting
v2: get rid of extra debug crap

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 01:13:00 -05:00
Stéphane Graber
c154af98c1 Export LXC_TARGET env variable in stop hook
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 01:10:30 -05:00
Stéphane Graber
114387972a
debian: Fix container creation on missing cache
This is currently breaking our daily image builds which happen in a
perfectly clean environment without a Debian keyring and without
anything in /var/cache/lxc

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2015-11-20 00:34:09 -05:00
Stéphane Graber
47eb52be9a Merge pull request #702 from hallyn/2015-11-17/comment
lxc_container struct: add comment about moving member fns
2015-11-18 00:18:54 -05:00
Stéphane Graber
e8f6a15cfa Merge pull request #700 from hallyn/2015-11-17/preserve_ns.2
Better handle preserve_ns behavior
2015-11-18 00:18:24 -05:00
Serge Hallyn
e2ae7f6d8c lxc_container struct: add comment about moving member fns
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-11-17 23:05:37 -06:00
Stéphane Graber
9dbcd66833 Add getsubopt implementation for Android
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-11-17 21:25:46 -05:00
Stéphane Graber
0c233eeec5 Merge pull request #701 from hallyn/fixunexp
lxcapi_clone: restore the unexpanded config len
2015-11-17 18:02:10 -05:00
Serge Hallyn
3b39251985 lxcapi_clone: restore the unexpanded config len
Otherwise it gets shortened with the temporary len but never
restored - which will only break API users which do a clone
then continue to use the original container, meaning this is
a hard one to detect.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-11-17 15:05:05 -06:00
Serge Hallyn
ab5e52f6a3 Revert "seccomp: handle inverted arch"
It breaks container starts.

This reverts commit 473ebc77d6.
2015-11-17 14:01:04 -06:00