Commit Graph

9144 Commits

Author SHA1 Message Date
Christian Brauner
eafc1bb6e6
mainloop: cleanup
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-20 18:02:42 +01:00
Christian Brauner
3e92b6f7e4
log: add missing variable and fix CMD_SYSINFO()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-20 17:53:05 +01:00
Christian Brauner
53c7622549
log: cleanup
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-20 17:49:48 +01:00
Stéphane Graber
92956baacf
Merge pull request #3315 from brauner/2020-03-20/fixes
log: add missing \
2020-03-20 11:16:02 -04:00
Christian Brauner
017c2940de
log: add missing \
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-20 16:00:36 +01:00
Stéphane Graber
b3d528ef8b
Merge pull request #3314 from brauner/2020-03-20/fixes
start: move reading seccomp profile after pre-start hook
2020-03-20 10:39:15 -04:00
Christian Brauner
2e1361a686
start: move reading seccomp profile after pre-start hook
This allows users to generate custom profiles at startup.

Closes #1848.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-20 15:27:24 +01:00
Stéphane Graber
00ae4f277c
Merge pull request #3313 from brauner/2020-03-20/fixes
network: fixes
2020-03-20 09:20:09 -04:00
Christian Brauner
df706de4d3
lxc_user_nic: rework device creation
Closes #3058.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-20 14:04:17 +01:00
Christian Brauner
19bfd55a08
nl: improve how we surface errors
Closes #3057.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-20 14:04:08 +01:00
Stéphane Graber
72abae9e71
Merge pull request #3312 from brauner/2020-03-20/fixes
network: use cleanup macros
2020-03-20 07:50:29 -04:00
Christian Brauner
a5f5cb419b
network: use cleanup macros
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-20 12:30:07 +01:00
Stéphane Graber
d42ec8296f
Merge pull request #3310 from brauner/2020-03-19/fixes
network: fix ovs removal
2020-03-19 22:57:12 -04:00
Christian Brauner
d16bda44d4
network: use cleanup attributes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 17:43:13 +01:00
Christian Brauner
9c66dc4f2d
network: cleanup galore
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 17:10:02 +01:00
Christian Brauner
f27111671e
network: use is_empty_string() everywhere
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 16:32:48 +01:00
Christian Brauner
1ee56cffce
network: fix ovs removal
Closes #3137.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 16:24:09 +01:00
Stéphane Graber
de95b43693
Merge pull request #3309 from brauner/2020-03-19/fixes
tree-wide: logging fixes and hardening
2020-03-19 09:53:48 -04:00
Christian Brauner
d7d1e27a71
log: use global variable to catch statements in loggers
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 14:35:56 +01:00
Stéphane Graber
5e92858c8b
Merge pull request #3308 from brauner/2020-03-19/fixes
conf: flatten logic in mount_entry()
2020-03-19 09:30:47 -04:00
Christian Brauner
fc3b95335b
cgroups: don't call statements from loggers
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 14:27:29 +01:00
Christian Brauner
15f3e22b00
conf: flatten logic in mount_entry()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 13:46:16 +01:00
Stéphane Graber
af24b9e59a
Merge pull request #3307 from brauner/2020-03-19/fixes
network: fixes
2020-03-19 08:38:37 -04:00
Christian Brauner
f759178580
conf: don't accidently double-mount
Closes #3073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 13:11:03 +01:00
Christian Brauner
3c9fdb32fc
network: fix moving network devices with custom name
Closes #1271.
Closes #3131.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 12:51:02 +01:00
Christian Brauner
3473ca7649
network: introduce and use is_empty_string()
since some members of struct lxc_netdev are arrays, not pointers.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-19 12:45:23 +01:00
Stéphane Graber
74d40612ac
Merge pull request #3306 from brauner/2020-03-18/fixes
Makefile: fix typo
2020-03-18 13:44:14 -04:00
Christian Brauner
7f1d0e07bd
Makefile: fix typo
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-18 18:24:16 +01:00
Stéphane Graber
6b6de5c6e4
Merge pull request #3305 from brauner/2020-03-18/fixes
lxc-unshare: add syscall_wrappers.h to build requirements
2020-03-18 12:48:54 -04:00
Christian Brauner
9b57809d53
lxc-unshare: add syscall_wrappers.h to build requirements
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-18 16:08:08 +01:00
Stéphane Graber
ed754cd297
Merge pull request #3304 from brauner/2020-03-18/fixes
tree-wide: introduce and use syscall number header
2020-03-18 09:08:11 -04:00
Christian Brauner
bed09c9cc0
tree-wide: introduce and use syscall number header
This allows us:
- to compile on kernels with outdated headers
- compile on older kernels but shipping on newer kernels

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-18 10:48:40 +01:00
Stéphane Graber
ee555b2824
Merge pull request #3303 from brauner/2020-03-17/fixes
tools: fix -g and -u parameters for lxc-execute and lxc-attach and fix pidfd detection logic
2020-03-17 17:10:06 -04:00
Christian Brauner
8ad4fa6826
raw_syscalls: define __NR_pidfd_send_signal if missing
On all architectures we care about it's 424.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-17 21:55:38 +01:00
Christian Brauner
cc94aaf3f9
tools: fix -g -u parameters for lxc-execute and lxc-attach
Closes #3188.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-17 18:07:50 +01:00
Stéphane Graber
a1d5a1d42a
Merge pull request #3301 from brauner/2020-03-17/fixes
lxc_user_nic: don't depend on MAP_FIXED
2020-03-17 12:57:31 -04:00
Christian Brauner
9820e789fa
ISSUE_TEMPLATE: fix -l -o order
Closes #3220.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-17 17:38:05 +01:00
Christian Brauner
2120b89b0f
lxc_user_nic: don't depend on MAP_FIXED
as this breaks on sparc.

Closes #3262.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-17 17:26:14 +01:00
Stéphane Graber
bff9399765
busybox: Mark mqueue optional
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2020-03-16 21:49:55 -04:00
Stéphane Graber
4876ac07f1
Merge pull request #3300 from Rachid-Koucha/patch-4
Auto-create /dev/shm and /dev/mqueue
2020-03-16 17:12:23 -04:00
Rachid Koucha
1f76a6a777
Auto-create /dev/shm and /dev/mqueue
Mount fs on /dev/shm and /dev/mqueue to experiment IPC in namespaces

Signed-off-by: Rachid Koucha <rachid.koucha@gmail.com>
2020-03-16 21:19:15 +01:00
Christian Brauner
7d50440706
Merge pull request #3299 from stgraber/master
Fix build
2020-03-16 20:52:52 +01:00
Stéphane Graber
83e280f649
busybox: Fix bad lxc.mount.entry
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2020-03-16 15:48:32 -04:00
Stéphane Graber
1949358f9d
doc: Fix grammar
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2020-03-16 15:48:17 -04:00
Stéphane Graber
b834e091a4
Merge pull request #3297 from Rachid-Koucha/patch-2
Trigger the mounting of shm file system
2020-03-16 14:40:39 -04:00
Rachid Koucha
078c676f4d
Trigger the mounting of shm file system
shm file system was not mounted because of the "/" in :
lxc.mount.entry = shm /dev/shm tmpfs defaults 0 0

Signed-off-by: Rachid Koucha <rachid.koucha@gmail.com>
2020-03-16 19:10:00 +01:00
Stéphane Graber
b4242db034
Merge pull request #3295 from brauner/2020-03-15/fixes
smaller cleanups and simplifications
2020-03-15 13:13:39 -04:00
Christian Brauner
fd5be714fb
tree-wide: s/lxc_fini()/lxc_end()/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-15 15:52:30 +01:00
Christian Brauner
0c5859ff68
tree-wide: remove "name" argument from lxc_{fini,abort}()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-15 15:50:34 +01:00
Christian Brauner
7bdf97d26b
{_}lxc_start: remove "name" argument
as it's directly available in the handler itself.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2020-03-15 15:45:54 +01:00