Commit Graph

4714 Commits

Author SHA1 Message Date
Stéphane Graber
2b097b7b0a s390x: Fix seccomp handling of personalities
There are no personalities for s390x, so don't list itself as one.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-10-20 16:54:31 -04:00
Christian Brauner
514120e227 Merge pull request #1241 from jirutka/alpine-setfcap
lxc-alpine: do not drop setfcap
2016-10-18 18:49:17 +02:00
Jakub Jirutka
64365bc2e9
lxc-alpine: do not drop setfcap
Signed-off-by: Jakub Jirutka <jakub@jirutka.cz>
2016-10-18 18:10:51 +02:00
Christian Brauner
237c1d93e6 Merge pull request #1240 from roedie/alpine-fix-extra-packages
alpine: Fix installing extra packages
2016-10-18 17:22:20 +02:00
roedie
691202ae0f alpine: Fix installing extra packages
Signed-off-by: Sander Klein <github@roedie.nl>
2016-10-18 16:55:16 +02:00
Serge Hallyn
70baef7c39 Merge pull request #1234 from brauner/2016-10-14/better_errors_for_lxc_start
tools: better error reporting for lxc-start
2016-10-18 09:49:29 -05:00
Christian Brauner
040f39c45f
tools: better error reporting for lxc-start
Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-10-18 16:25:31 +02:00
Stéphane Graber
1dc94b4a1b Merge pull request #1233 from brauner/2016-10-14/allow_overlay
tools: make overlay a valid backend for lxc-copy
2016-10-14 12:31:18 -04:00
Stéphane Graber
33fc3fad2d Merge pull request #1235 from Dean4Devil/master
Add voidlinux distribution
2016-10-14 12:30:42 -04:00
Gregor Reitzenstein
f6bd219e6b Add voidlinux distribution
Signed-off-by: Gregor Reitzenstein <dean4devil@paranoidlabs.org>
2016-10-14 15:20:39 +02:00
Christian Brauner
adc9b24992
tools: make overlay valid backend
So far, users could only create overlay snapshots by specifying -B overlayfs
and not with -B overlay. This adds support for -B overlay.

Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-10-14 14:23:02 +02:00
Christian Brauner
2c34c8f203
tools: fix coding style in lxc_attach
Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-10-14 14:22:57 +02:00
Christian Brauner
40e3d7a274 Merge pull request #1232 from Cypresslin/fix-s390x-download
tests: fix image download for s390x
2016-10-14 11:05:01 +02:00
Po-Hsu Lin
64ea46c721 tests: fix image download for s390x
Make release selection more flexible.
Update the KNOWN_RELEAES list, add yakkety and remove vivid.

Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
2016-10-14 16:17:30 +08:00
Stéphane Graber
1ca09fb31e Merge pull request #1230 from Jafaral/master
Drop leftover references to lxc_strerror().
2016-10-13 19:57:30 -04:00
Jafar Al-Gharaibeh
4c6f1e88e3 Drop leftover references to lxc_strerror().
lxc_strerror() was dropped long time ago, in 2009 to be exact.

Related commit:
7cee878951

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
2016-10-13 18:35:29 -05:00
Serge Hallyn
414de7212d Merge pull request #1229 from stgraber/master
archlinux: Fix resolving
2016-10-13 14:15:44 -05:00
Stéphane Graber
137162e847 archlinux: Fix resolving
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-10-13 15:02:56 -04:00
Serge Hallyn
5a42f4ed5a Merge pull request #1228 from stgraber/master
archlinux: Do DHCP on eth0
2016-10-13 13:38:35 -05:00
Stéphane Graber
b6a7263939 archlinux: Do DHCP on eth0
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-10-13 14:32:03 -04:00
Christian Brauner
74cdd72366 Merge pull request #1226 from jirutka/alpine-shm
lxc-alpine: mount /dev/shm as tmpfs
2016-10-12 13:49:32 +02:00
Jakub Jirutka
48938fe71d
lxc-alpine: mount /dev/shm as tmpfs
Signed-off-by: Jakub Jirutka <jakub@jirutka.cz>
2016-10-12 13:33:27 +02:00
Christian Brauner
aa74ed7b96 Merge pull request #1225 from jiazhang0/master
log: sanity check the returned value from snprintf()
2016-10-12 11:49:57 +02:00
Lans Zhang
f6c796102a log: sanity check the returned value from snprintf()
The returned value from snprintf() should be checked carefully.

This bug can be leveraged to execute arbitrary code through carefully
constructing the payload, e.g,

lxc-freeze -n `python -c "print 'AAAAAAAA' + 'B'*959"` -P PADPAD -o /tmp/log

This command running on Ubuntu 14.04 (x86-64) can cause a segment fault.

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
2016-10-11 09:28:08 +08:00
Christian Brauner
b8fc6b3671 Merge pull request #1224 from evgeni/python-utf8
mark the python examples as having utf-8 encoding
2016-10-08 19:18:17 +02:00
Evgeni Golov
59e8ed7637 mark the python examples as having utf-8 encoding
this allows running them also under Python2, which otherwise
would choke on Stéphane's name and error out with
 SyntaxError: Non-ASCII character '\xc3' in file …

Signed-off-by: Evgeni Golov <evgeni@debian.org>
2016-10-08 18:31:33 +02:00
Christian Brauner
fd5cf68167 Merge pull request #1223 from evgeni/unit-doc
add Documentation entries to lxc and lxc@ units
2016-10-08 15:02:03 +02:00
Evgeni Golov
6a27d555e7 add Documentation entries to lxc and lxc@ units
Signed-off-by: Evgeni Golov <evgeni@debian.org>
2016-10-08 14:09:17 +02:00
Serge Hallyn
fcb14ee840 Merge pull request #1171 from brauner/2016-09-06/detect_ramfs_rootfs
improve detect_ramfs_rootfs() and add test
2016-10-06 08:34:16 -05:00
Stéphane Graber
2d94f09fd1 Merge pull request #1217 from brauner/2016-09-29/lxc_checkconfig
tools: lxc-checkconfig conditionalize devpts check
2016-10-05 04:16:51 -04:00
Christian Brauner
7cde88f74d Merge pull request #1221 from stgraber/master
Define LXC_DEVEL to detect development releases
2016-10-04 19:12:55 +02:00
Stéphane Graber
d2d6b991b8 Define LXC_DEVEL to detect development releases
This can be used by downstreams to improve their "feature" checks.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-10-04 18:31:29 +02:00
Christian Brauner
873d48ce93
tools: lxc-checkconfig conditionalize devpts check
Only check for DEVPTS_MULTIPLE_INSTANCES on kernels < 4.7.

Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-09-29 10:44:09 +02:00
Christian Brauner
afb4de25fc Merge pull request #1214 from roman-mueller/fix_centos_spelling
Fix spelling of CentOS in the templates
2016-09-28 11:15:53 +02:00
Roman Mueller
491a01cf7b Fix spelling of CentOS in the templates
Signed-off-by: Roman Mueller <roman.mueller@gmail.com>
2016-09-28 10:03:39 +02:00
Christian Brauner
24b9970e8c tests: add test for detect_ramfs_rootfs()
Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-09-27 22:51:46 +02:00
Christian Brauner
fa454c8e3b utils: make detect_ramfs_rootfs() return bool
Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-09-27 22:48:14 +02:00
Stéphane Graber
92281f0275 Merge pull request #1212 from brauner/2016-09-26/fix_lxc_deslashify
utils: lxc_deslashify() free memory
2016-09-26 20:38:37 -04:00
Christian Brauner
f85b16a104
utils: lxc_deslashify() free memory
Make sure we always free any memory that was allocated by the call to
lxc_normalize_path().

Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-09-26 22:42:52 +02:00
Stéphane Graber
7be721c185 Merge pull request #1209 from brauner/2016-09-25/lxc_deslashify
2016 09 25/lxc deslashify
2016-09-26 16:00:40 -04:00
Christian Brauner
5d1f62b409 Merge pull request #1210 from d4s/altlinux-fix
Fix for ALTLinux container creation in all branches
2016-09-26 20:42:50 +02:00
Denis Pynkin
0b7c005e28
Fix for ALTLinux container creation in all branches
Use 'apt-conf' virtual package for ALTLinux default packages set

Signed-off-by: Denis Pynkin <denis_pynkin@epam.com>
2016-09-26 20:54:18 +03:00
Christian Brauner
1a514c157d
tests: add unit tests for lxc_deslashify()
Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-09-26 19:41:37 +02:00
Christian Brauner
c56a9652d7
tools: lxc_deslashify() handle special cases
Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-09-26 19:41:34 +02:00
Stéphane Graber
30498b9e1d Merge pull request #1207 from brauner/2016-09-25/fix_lxc_string_split
utils: fix lxc_string_split()
2016-09-25 14:45:22 -04:00
Christian Brauner
605ea1f73b
utils: fix lxc_string_split()
Make sure we don't return uninitialized memory.

Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-09-25 17:20:25 +02:00
Christian Brauner
021eb12614 Merge pull request #1206 from cwoac/master
Fix null derefence if attach is called without access to any tty
2016-09-25 11:22:21 +02:00
Oliver Matthews
b9a24c4f2f Fix null derefence if attach is called without access to any tty
Signed-off-by: Oliver Matthews <oliver@codersoffortune.net>
2016-09-25 09:37:43 +01:00
Christian Brauner
0f73b621c4 Merge pull request #1204 from tych0/close-tty-on-restore
c/r: detatch from controlling tty on restore
2016-09-22 00:08:14 +02:00
Tycho Andersen
a7fb6043b9 c/r: detatch from controlling tty on restore
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
2016-09-21 21:46:20 +00:00