proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-12 18:49:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,283 Commits 6 Branches 17 Tags 29 MiB
cb54b5798a
Commit Graph

5283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evgeni Golov
bc39575656 fix rpm build, include all built files, but only once 
Signed-off-by: Evgeni Golov <evgeni@debian.org>
 2016-10-29 20:29:18 +02:00
Evgeni Golov
73bf276366 use python3_sitearch for including the python code 
Closes: #502
Signed-off-by: Evgeni Golov <evgeni@debian.org>
 2016-10-29 20:29:08 +02:00
Christian Brauner
ca1faa6822 Merge pull request #1252 from stgraber/master 
Fix environment before importing setuptools
 2016-10-26 01:53:17 +02:00
Stéphane Graber
c223a53622 Fix environment before importing setuptools 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 2016-10-25 19:08:34 -04:00
Christian Brauner
ac94fda679 Merge pull request #1251 from stgraber/master 
Tweak libtool handling to work with Android
 2016-10-25 23:23:17 +02:00
Stéphane Graber
f4790f1f61 Tweak libtool handling to work with Android 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 2016-10-25 16:40:21 -04:00
Christian Brauner
7d1937d093 Merge pull request #1248 from tych0/use-external 
c/r: use external
 2016-10-25 10:21:38 +02:00
Serge Hallyn
00afe6d90c Merge pull request #1249 from stgraber/master 
ubuntu: Fix package upgrades requiring proc
 2016-10-24 20:23:34 -05:00
Tycho Andersen
796a109dbe c/r: use snprintf to compute device name 
This will never actually overflow, because %d is 32 bits and eth is 128
bytes long, but safety first :)

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
 2016-10-24 16:58:06 -06:00
Tycho Andersen
f0b458e105 c/r: drop duplicate hunk from macvlan case 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
 2016-10-24 16:55:27 -06:00
Stéphane Graber
e34466fe96 ubuntu: Fix package upgrades requiring proc 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 2016-10-24 18:39:02 -04:00
Tycho Andersen
e269733002 c/r: add checkpoint/restore support for macvlan interfaces 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
 2016-10-24 21:28:56 +00:00
Tycho Andersen
2f3fbc6bf3 c/r: remember to increment netnr 
We need this for calculating the name of unnamed interfaces in the config.
But we also need to remember to increment it :)

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
 2016-10-24 21:28:56 +00:00
Tycho Andersen
0f90d613ab c/r: use --external instead of --veth-pair 
--veth-pair has been deprecated as of 2.6, let's use the new --external
instead.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
 2016-10-24 21:28:56 +00:00
Christian Brauner
7fd5ab2afc Merge pull request #1245 from stgraber/master 
Setup libtool
 2016-10-22 01:20:46 +02:00
Stéphane Graber
26419a7a73 Use libtool for liblxc.so 
This should allow proper filtering of build flags for libraries and make
it easier to use PIE/PIC.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 2016-10-21 18:32:18 -04:00
Christian Brauner
4ab12dacef Merge pull request #1244 from Cypresslin/fix-lxc-copy-B 
tools: correct the argument typo in lxc_copy
 2016-10-21 13:05:39 +02:00
Po-Hsu Lin
3b0dcf2c76 tools: correct the argument typo in lxc_copy 
Correct the backingstorage typo in lxc_copy.

Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
 2016-10-21 18:32:18 +08:00
Christian Brauner
0fa4e360f8 Merge pull request #1243 from stgraber/master 
s390x: Fix seccomp handling of personalities
 2016-10-20 23:45:15 +02:00
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