]>
git.proxmox.com Git - mirror_lxc.git/log
Christian Brauner [Fri, 20 Mar 2020 16:53:05 +0000 (17:53 +0100)]
log: add missing variable and fix CMD_SYSINFO()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 20 Mar 2020 16:49:48 +0000 (17:49 +0100)]
log: cleanup
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 20 Mar 2020 15:00:36 +0000 (16:00 +0100)]
log: add missing \
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Fri, 20 Mar 2020 14:39:15 +0000 (10:39 -0400)]
Merge pull request #3314 from brauner/2020-03-20/fixes
start: move reading seccomp profile after pre-start hook
Christian Brauner [Fri, 20 Mar 2020 14:25:41 +0000 (15:25 +0100)]
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>
Stéphane Graber [Fri, 20 Mar 2020 13:20:09 +0000 (09:20 -0400)]
Merge pull request #3313 from brauner/2020-03-20/fixes
network: fixes
Christian Brauner [Fri, 20 Mar 2020 13:04:17 +0000 (14:04 +0100)]
lxc_user_nic: rework device creation
Closes #3058.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 20 Mar 2020 12:04:23 +0000 (13:04 +0100)]
nl: improve how we surface errors
Closes #3057.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Fri, 20 Mar 2020 11:50:29 +0000 (07:50 -0400)]
Merge pull request #3312 from brauner/2020-03-20/fixes
network: use cleanup macros
Christian Brauner [Fri, 20 Mar 2020 11:16:17 +0000 (12:16 +0100)]
network: use cleanup macros
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Fri, 20 Mar 2020 02:57:12 +0000 (22:57 -0400)]
Merge pull request #3310 from brauner/2020-03-19/fixes
network: fix ovs removal
Christian Brauner [Thu, 19 Mar 2020 16:34:18 +0000 (17:34 +0100)]
network: use cleanup attributes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 19 Mar 2020 16:09:13 +0000 (17:09 +0100)]
network: cleanup galore
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 19 Mar 2020 15:32:48 +0000 (16:32 +0100)]
network: use is_empty_string() everywhere
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 19 Mar 2020 15:08:44 +0000 (16:08 +0100)]
network: fix ovs removal
Closes #3137.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Thu, 19 Mar 2020 13:53:48 +0000 (09:53 -0400)]
Merge pull request #3309 from brauner/2020-03-19/fixes
tree-wide: logging fixes and hardening
Christian Brauner [Thu, 19 Mar 2020 13:28:02 +0000 (14:28 +0100)]
log: use global variable to catch statements in loggers
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Thu, 19 Mar 2020 13:30:47 +0000 (09:30 -0400)]
Merge pull request #3308 from brauner/2020-03-19/fixes
conf: flatten logic in mount_entry()
Christian Brauner [Thu, 19 Mar 2020 13:27:29 +0000 (14:27 +0100)]
cgroups: don't call statements from loggers
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 19 Mar 2020 12:27:51 +0000 (13:27 +0100)]
conf: flatten logic in mount_entry()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Thu, 19 Mar 2020 12:38:37 +0000 (08:38 -0400)]
Merge pull request #3307 from brauner/2020-03-19/fixes
network: fixes
Christian Brauner [Thu, 19 Mar 2020 12:11:03 +0000 (13:11 +0100)]
conf: don't accidently double-mount
Closes #3073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 19 Mar 2020 11:46:00 +0000 (12:46 +0100)]
network: fix moving network devices with custom name
Closes #1271.
Closes #3131.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 19 Mar 2020 11:45:23 +0000 (12:45 +0100)]
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>
Stéphane Graber [Wed, 18 Mar 2020 17:44:14 +0000 (13:44 -0400)]
Merge pull request #3306 from brauner/2020-03-18/fixes
Makefile: fix typo
Christian Brauner [Wed, 18 Mar 2020 17:24:16 +0000 (18:24 +0100)]
Makefile: fix typo
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 18 Mar 2020 16:48:54 +0000 (12:48 -0400)]
Merge pull request #3305 from brauner/2020-03-18/fixes
lxc-unshare: add syscall_wrappers.h to build requirements
Christian Brauner [Wed, 18 Mar 2020 15:07:15 +0000 (16:07 +0100)]
lxc-unshare: add syscall_wrappers.h to build requirements
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 18 Mar 2020 13:08:11 +0000 (09:08 -0400)]
Merge pull request #3304 from brauner/2020-03-18/fixes
tree-wide: introduce and use syscall number header
Christian Brauner [Wed, 18 Mar 2020 09:43:44 +0000 (10:43 +0100)]
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>
Stéphane Graber [Tue, 17 Mar 2020 21:10:06 +0000 (17:10 -0400)]
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
Christian Brauner [Tue, 17 Mar 2020 20:55:38 +0000 (21:55 +0100)]
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>
Christian Brauner [Tue, 17 Mar 2020 17:07:50 +0000 (18:07 +0100)]
tools: fix -g -u parameters for lxc-execute and lxc-attach
Closes #3188.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 17 Mar 2020 16:57:31 +0000 (12:57 -0400)]
Merge pull request #3301 from brauner/2020-03-17/fixes
lxc_user_nic: don't depend on MAP_FIXED
Christian Brauner [Tue, 17 Mar 2020 16:38:05 +0000 (17:38 +0100)]
ISSUE_TEMPLATE: fix -l -o order
Closes #3220.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 17 Mar 2020 13:55:45 +0000 (14:55 +0100)]
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>
Stéphane Graber [Tue, 17 Mar 2020 01:49:55 +0000 (21:49 -0400)]
busybox: Mark mqueue optional
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Mon, 16 Mar 2020 21:12:23 +0000 (17:12 -0400)]
Merge pull request #3300 from Rachid-Koucha/patch-4
Auto-create /dev/shm and /dev/mqueue
Rachid Koucha [Mon, 16 Mar 2020 20:19:15 +0000 (21:19 +0100)]
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>
Christian Brauner [Mon, 16 Mar 2020 19:52:52 +0000 (20:52 +0100)]
Merge pull request #3299 from stgraber/master
Fix build
Stéphane Graber [Mon, 16 Mar 2020 19:48:32 +0000 (15:48 -0400)]
busybox: Fix bad lxc.mount.entry
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Mon, 7 Oct 2019 23:32:08 +0000 (19:32 -0400)]
doc: Fix grammar
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Mon, 16 Mar 2020 18:40:39 +0000 (14:40 -0400)]
Merge pull request #3297 from Rachid-Koucha/patch-2
Trigger the mounting of shm file system
Rachid Koucha [Mon, 16 Mar 2020 18:10:00 +0000 (19:10 +0100)]
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>
Stéphane Graber [Sun, 15 Mar 2020 17:13:39 +0000 (13:13 -0400)]
Merge pull request #3295 from brauner/2020-03-15/fixes
smaller cleanups and simplifications
Christian Brauner [Sun, 15 Mar 2020 14:52:30 +0000 (15:52 +0100)]
tree-wide: s/lxc_fini()/lxc_end()/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 14:50:34 +0000 (15:50 +0100)]
tree-wide: remove "name" argument from lxc_{fini,abort}()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 14:45:54 +0000 (15:45 +0100)]
{_}lxc_start: remove "name" argument
as it's directly available in the handler itself.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 14:38:49 +0000 (15:38 +0100)]
start: add missing TRACE() call
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 14:37:00 +0000 (15:37 +0100)]
start: better goto target naming in __lxc_start()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 14:26:47 +0000 (15:26 +0100)]
start: rework cleanup code in __lxc_start()
This makes the goto labels slightly more convoluted but allows us to further
simplify the cleanup in lxc_init().
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 13:56:21 +0000 (14:56 +0100)]
start: simplify lxc_init()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 13:37:42 +0000 (14:37 +0100)]
conf: don't wrap strings
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Sun, 15 Mar 2020 06:16:14 +0000 (02:16 -0400)]
Merge pull request #3294 from brauner/2020-03-15/fixes
memory_utils: improvements
Christian Brauner [Sun, 15 Mar 2020 01:40:13 +0000 (02:40 +0100)]
tree-wide: remove last -1 fd initialization with cleanup macros in favor of -EBADF
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 01:38:36 +0000 (02:38 +0100)]
tree-wide: s/__do_close_prot_errno/__do_close/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 01:34:20 +0000 (02:34 +0100)]
memory_utils: adapt to new infrastructure
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 00:55:24 +0000 (01:55 +0100)]
tree-wide: port cgroup cleanup to call_cleaner(cgroup_exit)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 00:37:32 +0000 (01:37 +0100)]
caps: port to call_cleaner() based cleanup
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 15 Mar 2020 00:28:22 +0000 (01:28 +0100)]
memory_utils: add call_cleaner() helper
This allows to trivially declare cleanup attributes on the fly.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Sat, 14 Mar 2020 14:18:25 +0000 (10:18 -0400)]
Merge pull request #3293 from brauner/2020-03-14/travis_enable_arches
travis: enable all architectures
Christian Brauner [Sat, 14 Mar 2020 12:07:39 +0000 (13:07 +0100)]
travis: enable all architectures
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 14 Mar 2020 12:13:37 +0000 (13:13 +0100)]
travis: remove libgnutls-dev
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 11 Mar 2020 21:05:57 +0000 (17:05 -0400)]
Merge pull request #3291 from brauner/2020-03-11/fixes
bugfixes
Christian Brauner [Wed, 11 Mar 2020 18:24:02 +0000 (19:24 +0100)]
utils: cleanup
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 17:56:54 +0000 (18:56 +0100)]
file_utils: cleanup macros and improvements
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 11 Mar 2020 15:34:34 +0000 (11:34 -0400)]
Merge pull request #3290 from brauner/2020-03-11/fixes
pidfds: switch infrastructure to rely on pidfds whenever possible
Christian Brauner [Wed, 11 Mar 2020 15:05:13 +0000 (16:05 +0100)]
api-extensions: use correct headings
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 15:03:09 +0000 (16:03 +0100)]
api-extensions: document "network_veth_router" api extension
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 15:02:14 +0000 (16:02 +0100)]
api-extensions: reflow "seccomp_allow_nesting" api extension
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 15:01:01 +0000 (16:01 +0100)]
api-extensions: reflow "seccomp_notify" api extension
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 15:00:34 +0000 (16:00 +0100)]
api-extensions: reflow "cgroup2_devices" extensions
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 15:00:11 +0000 (16:00 +0100)]
api-extensions: reflow "cgroup2" api extension
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 14:13:33 +0000 (15:13 +0100)]
api-extensions: add "pidfd" api extension
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 14:05:45 +0000 (15:05 +0100)]
lxccontainer: switch to pidfd polling when shutting down containers
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 13:36:58 +0000 (14:36 +0100)]
lxccontainer: switch to pidfds whenever possible
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 13:02:40 +0000 (14:02 +0100)]
start: add ability to detect whether kernel supports pidfds
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 12:11:07 +0000 (13:11 +0100)]
lxccontainer: add init_pidfd() API extension
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 12:01:17 +0000 (13:01 +0100)]
commands: LXC_CMD_GET_INIT_PIDFD
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 12:04:18 +0000 (13:04 +0100)]
lxccontainer.h: document seccomp_notify_fd()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 11 Mar 2020 13:37:13 +0000 (09:37 -0400)]
Merge pull request #3289 from tenforward/japanese
doc: Add keyring options to Japanese lxc.containers.conf(5)
Christian Brauner [Wed, 11 Mar 2020 11:57:22 +0000 (12:57 +0100)]
commands: use LXC_CMD_REAP_CLIENT_FD in lxc_cmd_get_cgroup2_fd_callback()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 11:02:10 +0000 (12:02 +0100)]
commands: add ability to audit fd connection and cleanup path
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
KATOH Yasufumi [Wed, 11 Mar 2020 06:56:35 +0000 (15:56 +0900)]
doc: Fix typo
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
KATOH Yasufumi [Wed, 11 Mar 2020 06:25:00 +0000 (15:25 +0900)]
Merge branch 'master' into japanese
KATOH Yasufumi [Wed, 11 Mar 2020 06:21:36 +0000 (15:21 +0900)]
doc: Add keyring options to Japanese lxc.containers.conf(5)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Stéphane Graber [Wed, 11 Mar 2020 02:47:25 +0000 (22:47 -0400)]
Merge pull request #3288 from brauner/2020-03-11/fixes
commands: simplify lxc_cmd_fd_cleanup()
Christian Brauner [Wed, 11 Mar 2020 02:33:16 +0000 (03:33 +0100)]
commands: simplify lxc_cmd_fd_cleanup()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 11 Mar 2020 02:23:35 +0000 (22:23 -0400)]
Merge pull request #3287 from brauner/2020-03-11/fixes
fixes
Christian Brauner [Wed, 11 Mar 2020 01:59:36 +0000 (02:59 +0100)]
commands_utils: fix command socket hashing
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 01:35:51 +0000 (02:35 +0100)]
af_unix: fix return value
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 11 Mar 2020 00:56:44 +0000 (01:56 +0100)]
start: cleanup file descriptor closing
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 10 Mar 2020 22:03:17 +0000 (18:03 -0400)]
Merge pull request #3286 from brauner/2020-03-10/fixes
commands: make sure to always close the client fd
Christian Brauner [Tue, 10 Mar 2020 21:33:00 +0000 (22:33 +0100)]
commands: make sure to always close the client fd
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 10 Mar 2020 21:05:00 +0000 (17:05 -0400)]
Merge pull request #3285 from brauner/2020-03-10/fixes
bugfixes
Christian Brauner [Tue, 10 Mar 2020 20:46:25 +0000 (21:46 +0100)]
commands: improve state client cleanup
Improves:
ebbca8529732 ("commands_utils: fix socket leak when adding state client")
Cc: Matthias Hardt <matthias.hardt@gmail.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 10 Mar 2020 20:35:25 +0000 (21:35 +0100)]
commands: switch to pid_t to send around pid
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 10 Mar 2020 19:21:09 +0000 (15:21 -0400)]
Merge pull request #3283 from brauner/2020-03-10/fixes
bugfixes
Christian Brauner [Tue, 10 Mar 2020 16:52:35 +0000 (17:52 +0100)]
share_ns: improve error handling
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 10 Mar 2020 16:52:35 +0000 (17:52 +0100)]
share_ns: improve error handling
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>