Commit Graph

4477 Commits

Author SHA1 Message Date
Stéphane Graber
8c041c2f68 Merge pull request #1031 from GreatFruitOmsk/pypi
python-lxc: enable standalone builds
2016-05-27 13:55:40 -04:00
Aleksandr Mezin
f2fec47531 python-lxc: search for lxc library and headers using pkg-config
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2016-05-27 22:23:02 +06:00
Aleksandr Mezin
43f965e015 travis: ensure 'make install' doesn't fail
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2016-05-27 21:56:21 +06:00
Aleksandr Mezin
6bc6062d3a travis: test VPATH builds
It looks like VPATH (split source and build directories) builds
are frequently broken. So let's test them on travis-ci.

Personally I use VPATH build in my deployment scripts.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2016-05-27 18:54:06 +06:00
Aleksandr Mezin
00d98acd9f python-lxc: pass include/library dirs as arguments to setup.py
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2016-05-27 18:05:17 +06:00
Aleksandr Mezin
58a44782d9 python-lxc: don't use private lxc/confile.h
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2016-05-27 18:05:14 +06:00
Aleksandr Mezin
0fbd2f6a89 python-lxc: don't use private lxc/utils.h
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2016-05-27 18:05:09 +06:00
Aleksandr Mezin
d51f78ed31 python-lxc: don't use private lxc/namespace.h
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2016-05-27 18:04:59 +06:00
Christian Brauner
95ca286dbd Merge pull request #1029 from joerg-krause/master
Fix redefinition of struct in6_addr
2016-05-23 21:29:49 +02:00
Jörg Krause
07d10e71d5 Fix redefinition of struct in6_addr
struct in6_addr is both defined in the C library header <netinet/in.h>
and the Linux kernel header <linux/in6.h>.

lxc_user_nic.c includes both <netinet/in.h> and <linux/if_bridge.h>. The
later one includes <linux/in6.h>.

This breaks build with the musl libc:
  error: redefinition of ‘struct in6_addr’

As lxc_user_nic.c does not use any references from <linux/if_bridge.h> it
is safe to remove this header.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
2016-05-23 20:55:46 +02:00
Stéphane Graber
7679fc22f6 Merge pull request #1022 from Lisio/master
Fix hostname in interface config for apline template
2016-05-11 16:41:00 -04:00
Andrey Kostin
1c4ea80c9e Fix hostname in interface config for apline template
Signed-off-by: Andrey Kostin <andrey@kostin.email>
2016-05-11 23:32:40 +03:00
Stéphane Graber
c563b9a29d Merge pull request #1021 from odyssey4me/include_apt_transport_https
Add apt-transport-https to minbase variant packages_template
2016-05-11 13:41:48 -04:00
Jesse Pretorius
396f75abb3 Add apt-transport-https to minbase variant packages_template
In many environments the preference is to configure containers with
apt mirrors that are SSL-secured.

When building containers using the download template this can't be
done unless an insecure mirror is first used to install the
apt-transport-https package, then the sources reconfigured to
use the https URL.

When building containers without using the download template this
can't be done unless the container creator specifically includes
this package in the package list at build time.

It seems more intuitive to me to have the package installed by
default. This patch includes the required package for the minbase
variant only as this is the default.

Signed-off-by: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
2016-05-11 18:30:39 +01:00
Christian Brauner
5832d025f5 Merge pull request #1020 from stgraber/master
Also allow fstype=fuse for fuse filesystems
2016-05-11 19:17:13 +02:00
Stéphane Graber
e6faa0670c Also allow fstype=fuse for fuse filesystems
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-05-11 12:59:23 -04:00
Christian Brauner
6b63f7a119 Merge pull request #1019 from tych0/dont-force-irmap
Dont force irmap
2016-05-11 16:47:50 +02:00
Tycho Andersen
19d1509c39 c/r: add an option to use faster inotify support in CRIU
The idea here is that criu can use open_by_handle on a configuration which
will preserve inodes on moves across hosts, but shouldn't do that on
configurations which won't preserve inodes. Before, we forced it to always
be slow, but we don't have to do this.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
2016-05-11 13:59:48 +00:00
Stéphane Graber
199cb1fe22 Merge pull request #1017 from tych0/increase-log-line-size
log: remove duplicate definitons and bump buffer size
2016-05-10 18:51:18 -04:00
Tycho Andersen
b2c3710f74 c/r: rearrange things to pass struct migrate_opts all the way down
If we don't do this, we'll end up changing the function signatures for the
internal __criu_* functions each time we add a new parameter, which will
get very annoying very quickly. Since we already have the user's arguments
struct, let's just pass that all the way down.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
2016-05-10 16:26:20 -06:00
Tycho Andersen
88593cead8 log: remove duplicate definitons and bump buffer size
When writing out the CRIU exec command, we're bumping up against the buffer
size limit. Let's increase it so we can avoid:

lxc 20160509213229.921 WARN     lxc_log - log.c:log_append_logfile:111 - truncated next event from 523 to 512 bytes

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
2016-05-10 16:24:34 -06:00
Serge Hallyn
9504f141c2 Merge pull request #1015 from stewartbrodie/confile-value-quotes
Allow configuration file values to be quoted
2016-05-10 14:16:56 -05:00
Stewart Brodie
bd878deec3 Allow configuration file values to be quoted
If the value starts and ends with matching quote characters, those
characters are stripped automatically.   Quote characters are the
single quote (') or double quote (").  The quote removal is done after
the whitespace trimming.

This is needed particularly in order that lxc.environment values may
have trailing spaces.  However, the quote removal is done for all values
in the parse_line function, as it has non-const access to the value.

Signed-off-by: Stewart Brodie <stewart@metahusky.net>
2016-05-10 13:57:00 +01:00
Christian Brauner
2bec98546e Merge pull request #1014 from hallyn/2016-05-09/procnet
Unshare netns after setting the userns mappings
2016-05-09 23:37:42 +02:00
Serge Hallyn
5b1e83cbc4 Unshare netns after setting the userns mappings
so that there is a root uid mapping for the /proc/net files.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2016-05-09 15:53:26 -05:00
Christian Brauner
fc5bc4a6b4 Merge pull request #1013 from hartnellfoster/bugfix_20160509
Added OR statement for cases of ID = rhel in RHEL 7+
2016-05-09 13:51:20 +02:00
Hartnell Foster
0395c47c64 Added OR statement for cases of ID = rhel in RHEL 7+
Signed-off-by: Hartnell Foster <hartnell.foster@bbc.co.uk>
2016-05-09 12:42:56 +01:00
Serge Hallyn
972765f90f Merge pull request #1008 from brauner/bugfix_branch
sync.c: use correct types
2016-05-08 22:54:20 -05:00
Christian Brauner
d38c8d1691
sync.c: use correct types
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-05-08 15:39:25 +02:00
Christian Brauner
211a7794fc Merge pull request #1010 from creideiki/fix-cap-sys-resource-typo
Change sys_resources to sys_resource.
2016-05-08 11:19:48 +02:00
Karl-Johan Karlsson
19624ecae1 Change sys_resources to sys_resource.
gentoo.moresecure.conf tries to drop the capability CAP_SYS_RESOURCES.
However, that capability doesn't exist, so the container doesn't start.
Change it to CAP_SYS_RESOURCE, according to capabilities(7).

Also correct the same typo in a comment in slackware.common.conf.

Signed-off-by: Karl-Johan Karlsson <creideiki@ferretporn.se>
2016-05-08 10:46:36 +02:00
Serge Hallyn
bced9b015a Merge pull request #1005 from tych0/warn-about-unexpected-sync-size
sync: fail on unexpected message sizes
2016-05-06 18:16:21 -05:00
Tycho Andersen
fcd59cf0c8 sync: fail on unexpected message sizes
I think (?) this may be related to our hanging monitor bug. Let's do this
anyway, as it's probably a good idea.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
2016-05-06 11:21:39 -05:00
Christian Brauner
297dbb7b4f Merge pull request #1004 from Lisio/alpine-hostname
Force DHCP client to send hostname
2016-05-05 22:51:21 +02:00
Lisio
7f1473c315 Force DHCP client to send hostname
Required for proper applying dnsmasq config entries.

Signed-off-by: Andrey Kostin <andrey@kostin.email>
2016-05-05 17:59:28 +03:00
Christian Brauner
561067aa22 Merge pull request #998 from thtanaka/network-config
Improve on the case where default networking config is incomplete
2016-05-02 23:14:46 +02:00
Thomas Tanaka
bc3b327244 Improve on the case where default networking config is incomplete
Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
2016-05-02 11:57:15 -07:00
Christian Brauner
5bb64b32b8 Merge pull request #997 from ysbnim/master
Update Korean manuals
2016-05-02 11:46:20 +02:00
Sungbae Yoo
f7fe38741d doc: Add logging option to Korean lxc-attach(1)
Update for commit f43d63b

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-05-02 18:25:29 +09:00
Christian Brauner
25e032fb43 Merge pull request #995 from ar45/fix_system_error_init_container_failed
set PyErr when Container.__init__ fails
2016-05-01 23:42:15 +02:00
Christian Brauner
b4e73f49f3 Merge pull request #996 from ar45/add_network_type_to_keys
Expose lxc.network.type through lxc_list_nicconfigs()
2016-05-01 20:38:57 +02:00
Aron Podrigal
7483699228 Added type to keys in lxc_list_nicconfigs
Signed-off-by: Aron Podrigal <aronp@guaranteedplus.com>
2016-05-01 12:15:51 -04:00
Aron Podrigal
9dfb0ad9be Fixed - set PyErr when Container.__init__ fails
When container init failed for whatever reason, previously it resulted
in a `SystemError: NULL result without error in PyObject_Call`
This will now result in a RuntimeError with the error message
previously printed to stderr.

Signed-off-by: Aron Podrigal <aronp@guaranteedplus.com>
2016-05-01 11:38:33 -04:00
Stéphane Graber
0aeed838e7 Merge pull request #993 from walkerning/check-tty
Check if the stdout is a terminal in lxc-checkconfig
2016-05-01 04:17:42 +02:00
walkerning
8513d8cd02 Check if stdout is a terminal in lxc-checkconfig
Let lxc-checkconfig write to non-tty stdout without color control
characters
Signed-off-by: walkerning <foxdoraame@gmail.com>
2016-05-01 10:05:10 +08:00
Serge Hallyn
1970a777ed Merge pull request #991 from brauner/2016-04-28/less_syscall_for_lxc_ls
2016 04 28/less syscall for lxc ls
2016-04-29 13:26:26 -05:00
Christian Brauner
688cd8439d lxc-ls: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-04-28 23:45:05 +02:00
Christian Brauner
6daa3ea5ba lxc-ls: use fewer syscalls when doing ipc
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-04-28 23:45:00 +02:00
Stéphane Graber
1bf4292e3f Merge pull request #978 from evgeni/lsb-init-scripts
don't make sysv init scripts dependant on distribution specifics
2016-04-25 15:55:49 +02:00
Christian Brauner
a14574ba84 Merge pull request #987 from tenforward/japanese
doc: Add logging option to Japanese lxc-attach(1)
2016-04-25 12:35:19 +02:00