proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 10:12:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,609 Commits 6 Branches 17 Tags 29 MiB
4a094eec4a
Commit Graph

8609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Brauner
c3e3c21a10
seccomp: cleanup 
Simplify and cleanup some of the seccomp code. This mainly focuses on removing
the open coding of various seccomp settings all over the code place in favor of
centralized helpers.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-29 15:17:31 +02:00
Stéphane Graber
27b737093d
Merge pull request #2955 from tomponline/tp-ignore-test-build 
tests: Updates .gitignore to ignore test build artefacts
 2019-04-29 08:59:32 -04:00
Stéphane Graber
c62784df38
Merge pull request #2954 from tomponline/tp-vlan-hook 
network: Fixes vlan hook script
 2019-04-29 08:59:20 -04:00
tomponline
9574a3780a tests: Updates .gitignore to ignore test build artefacts 
Signed-off-by: tomponline <thomas.parrott@canonical.com>
 2019-04-29 09:50:06 +01:00
tomponline
19abca58e2 network: Fixes vlan hook script 
Signed-off-by: tomponline <thomas.parrott@canonical.com>
 2019-04-29 09:44:57 +01:00
tomponline
d4a7da4632 network: Adds support host side veth device static routes 
Adds the following new config keys:

	lxc.net.[i].veth.ipv4.route
	lxc.net.[i].veth.ipv6.route
E.g.

	lxc.net.0.veth.ipv4.route = 192.0.2.1/32
	lxc.net.0.veth.ipv4.route = 192.0.3.0/24
	lxc.net.0.veth.ipv6.route = 2001:db8::1/128
	lxc.net.0.veth.ipv6.route = 2001:db8:2::/64

Signed-off-by: tomponline <thomas.parrott@canonical.com>
 2019-04-29 08:38:33 +01:00
Stéphane Graber
41cd8a8d8c
Merge pull request #2951 from tomponline/tp-typo 
network: Fixes a little typo in an error message
 2019-04-26 14:45:10 -04:00
Stéphane Graber
6af0bd7bbf
Merge pull request #2952 from tomponline/tp-vlan-upscript 
network: Adds hook handling for vlan network type
 2019-04-26 14:44:55 -04:00
tomponline
3a73d9f109 network: Adds upscript handling for vlan network type 
Signed-off-by: tomponline <thomas.parrott@canonical.com>
 2019-04-26 18:01:53 +01:00
tomponline
eb0628a701 network: Fixes a little typo in an error message 
Signed-off-by: tomponline <thomas.parrott@canonical.com>
 2019-04-26 17:51:44 +01:00
Stéphane Graber
a82463a071
Merge pull request #2947 from brauner/2019-04-18/seccomp_trap 
seccomp: SECCOMP_RET_USER_NOTIF support
 2019-04-25 18:44:37 -04:00
Christian Brauner
eab649dc41
start: silence clang 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-25 21:35:52 +02:00
Christian Brauner
6cc93f0ed6
api_extensions: add seccomp_notify 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-25 21:35:52 +02:00
Christian Brauner
8a6437599c
doc: add lxc.seccomp.notify.proxy 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-25 21:35:52 +02:00
Christian Brauner
e35b7bf81c
seccomp: send default answer and try to reconnect 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-25 21:35:28 +02:00
Christian Brauner
86ce1da153
confile: add lxc.seccomp.notify.proxy 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-25 21:35:28 +02:00
Christian Brauner
cdb2a47f9b
seccomp: SECCOMP_RET_USER_NOTIF support 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-25 21:35:28 +02:00
Christian Brauner
05bbce37b0
Merge pull request #2948 from pgauret/patch-1 
Fix 'zfs get' command order
 2019-04-24 18:30:43 +02:00
pgauret
69b6aa3056
Fix 'zfs get' command order 
Another case of calling 'zfs get' which requires reordering arguments to work with latest zfs.

Signed-off-by: Paul Gauret <pgauret@yahoo.com>
 2019-04-24 18:29:21 +02:00
Christian Brauner
a24d015daf
Merge pull request #2946 from tych0/remove-bad-doc 
lxc-start: remove bad doc
 2019-04-23 17:08:13 +02:00
Tycho Andersen
bd65f5ce50 lxc-start: remove bad doc 
We don't in fact exit(1) if this is not specified, and it wouldn't make
sense to, since most people probably don't specify this.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
 2019-04-23 08:48:29 -06:00
Stéphane Graber
60c20c6e0e
Merge pull request #2945 from brauner/2019-04-19/netns_getifaddrs_adapt_to_kernel_changes 
netns_getifaddrs: adapt to kernel changes
 2019-04-19 13:58:23 -04:00
Christian Brauner
c8ca5a435c
netns_getifaddrs: adapt to kernel changes 
s/NETLINK_DUMP_STRICT_CHK/NETLINK_GET_STRICT_CHK/g

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-19 15:24:51 +02:00
Stéphane Graber
e12b27e5fb
Merge pull request #2943 from brauner/master 
configure: s/LDLAGS/LDFLAGS/
 2019-04-17 18:29:07 +01:00
Christian Brauner
e7d7f2686a
configure: s/LDLAGS/LDFLAGS/ 
I apparently cannot spell.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-17 19:12:07 +02:00
Stéphane Graber
2a5c677ca7
Merge pull request #2940 from brauner/master 
raw_syscalls: lxc_raw_clone() account for different trap number on 32bit SPARC
 2019-04-17 08:49:05 +01:00
Christian Brauner
b0b84070b0
Merge pull request #2941 from flx42/reorder-mounts 
conf: do lxc.mount.entry mounts right after lxc.mount.fstab
 2019-04-17 00:29:28 +02:00
Christian Brauner
e9e4dd29a3
Merge pull request #2942 from flx42/nvidia-hook-handle-spaces-env 
hooks/nvidia: handle spaces in NVIDIA_REQUIRE variables
 2019-04-17 00:00:18 +02:00
Felix Abecassis
c631115d05 conf: do lxc.mount.entry mounts right after lxc.mount.fstab 
These configuration options use the same syntax and therefore it seems
more intuitive to have the same behavior for both of them, which is
not the case today since mount hooks and autodev mounts are called
between the two.

See: https://github.com/lxc/lxc/issues/2932

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
 2019-04-16 14:40:34 -07:00
Christian Brauner
6dfb146378
raw_syscalls: lxc_raw_clone() 
Account for different trap number on 32bit SPARC.

Link: https://bugs.gentoo.org/656368
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-16 23:35:26 +02:00
Felix Abecassis
52e1d4cb49 hooks/nvidia: handle spaces in NVIDIA_REQUIRE variables 
Previously, environment variables with a space where splitted.

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
 2019-04-16 13:59:37 -07:00
Christian Brauner
12b4363390
Merge pull request #2938 from pgauret/patch-1 
Update zfs.c
 2019-04-16 00:22:41 +02:00
pgauret
6b4925455c
storage: update zfs 
Change zfs arguments. This also works with older zfs versions, tested with
zfs 0.7.9-3 on Ubuntu 18.10.

Closes #2916.

Signed-off-by: Paul Gauret <pgauret@yahoo.com>
[christian.brauner@ubuntu.com: adapt commit message and add Signed-off-by for Paul]
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-15 22:52:16 +02:00
Stéphane Graber
90912571af
Merge pull request #2937 from brauner/2019-04-14/issue_2912 
storage: prevent unitialized variable warning
 2019-04-14 14:07:34 -04:00
Stéphane Graber
49ce8186e6
Merge pull request #2936 from brauner/2019-04-14/issue_2935 
cgroups: fix potential nullderef
 2019-04-14 14:03:59 -04:00
Christian Brauner
240a130f67
storage: prevent unitialized variable warning 
We can simply fix this issue by switching to our cleanup macros instead of
manually freeing the memory.

Closes #2912.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-14 15:46:12 +02:00
Christian Brauner
b53a08535a
cgroups: fix potential nullderef 
The child_path variable is initialized very late in the function so jumping to
the on_error label would cause a nullderef. With the cleanup macros we can
simplify this function to simply do direct returns and avoid that whole issue.

Closes #2935.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-14 15:30:22 +02:00
Stéphane Graber
30a9d1371a
Merge pull request #2934 from brauner/2019-04-13/simplify_and_test 
attach: use tighter scope for fd variable
 2019-04-13 13:49:30 -04:00
Christian Brauner
427a80672f
attach: use tighter scope for fd variable 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-04-13 19:08:49 +02:00
Christian Brauner
9810d1916e
Merge pull request #2928 from yosukesan/api_doc_generation_fails_under_out_of_source_build#2927 
fix: #2927 api doc generation fails under out of source build.
 2019-04-06 15:14:31 +02:00
Christian Brauner
74f628ac32
Merge pull request #2926 from tenforward/japanese 
doc: update Japanese lxc-user-nic manpage
 2019-04-06 07:21:03 +02:00
yosukesan
13f7674329 fix: #2927 api doc generation fails under out of source build. 
Signed-off-by: yosukesan <y.otsuki30@gmail.com>
 2019-04-06 12:43:59 +09:00
KATOH Yasufumi
a1c4b8380d doc: update Japanese lxc-user-nic manpage 
Update for commit db74bbd

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
 2019-04-06 02:00:53 +09:00
Stéphane Graber
a38fa3d196
Merge pull request #2924 from brauner/2019-04-05/lxc_user_nice_update 
lxc-user-nic: update
 2019-04-05 12:32:39 -04:00
Christian Brauner
ff63fd780d
lxc-user-nic: validate request 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2019-04-05 14:16:09 +02:00
Christian Brauner
db74bbd003
doc: update lxc-user-nic manpage 
Closes #1823.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2019-04-05 14:15:36 +02:00
Christian Brauner
e94104b058
lxc-user-nic: small tweaks 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2019-04-05 14:14:24 +02:00
Christian Brauner
4f34c6f95d
Merge pull request #2923 from flx42/more-pdeathsig-fixes 
More pdeathsig fixes
 2019-04-04 16:50:41 +02:00
Felix Abecassis
97d8f4b773 Fix monitor pdeathsig handling 
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
 2019-04-03 21:12:38 -07:00
Felix Abecassis
f08a5cc4fc Fix user namespace pdeathsig handling 
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
 2019-04-03 21:09:53 -07:00