]>
git.ipfire.org Git - thirdparty/lxc.git/log
Christian Brauner [Tue, 8 Dec 2020 16:27:46 +0000 (17:27 +0100)]
confile: cleanup clr_config_init_cmd()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:27:31 +0000 (17:27 +0100)]
confile: cleanup clr_config_execute_cmd()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:26:52 +0000 (17:26 +0100)]
confile: cleanup clr_config_log_syslog()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:26:25 +0000 (17:26 +0100)]
confile: cleanup clr_config_seccomp_notify_proxy()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:26:05 +0000 (17:26 +0100)]
confile: cleanup clr_config_seccomp_notify_proxy()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:25:48 +0000 (17:25 +0100)]
confile: cleanup clr_config_seccomp_notify_cookie()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:25:31 +0000 (17:25 +0100)]
confile: cleanup clr_config_seccomp_allow_nesting()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:24:59 +0000 (17:24 +0100)]
confile: cleanup clr_config_console_logfile()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:24:42 +0000 (17:24 +0100)]
confile: cleanup clr_config_console_path()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:24:25 +0000 (17:24 +0100)]
confile: cleanup clr_config_uts_name()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:24:08 +0000 (17:24 +0100)]
confile: cleanup clr_config_rootfs_options()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:23:46 +0000 (17:23 +0100)]
confile: cleanup clr_config_rootfs_mount()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:23:19 +0000 (17:23 +0100)]
confile: cleanup clr_config_rootfs_path()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:22:59 +0000 (17:22 +0100)]
confile: cleanup clr_config_mount_fstab()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:22:36 +0000 (17:22 +0100)]
confile: cleanup clr_config_log_file()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:22:16 +0000 (17:22 +0100)]
confile: cleanup clr_config_cgroup_dir()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:21:56 +0000 (17:21 +0100)]
confile: cleanup clr_config_selinux_context_keyring()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:21:40 +0000 (17:21 +0100)]
confile: cleanup clr_config_selinux_context()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:21:23 +0000 (17:21 +0100)]
confile: cleanup clr_config_apparmor_profile()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:21:04 +0000 (17:21 +0100)]
confile: cleanup clr_config_tty_dir()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:20:22 +0000 (17:20 +0100)]
confile: cleanup get_config_proc()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:20:03 +0000 (17:20 +0100)]
confile: cleanup get_config_sysctl()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:19:38 +0000 (17:19 +0100)]
confile: get_config_prlimit()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:19:09 +0000 (17:19 +0100)]
confile: cleanup get_config_seccomp_notify_proxy()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:18:53 +0000 (17:18 +0100)]
confile: cleanup get_config_seccomp_notify_cookie()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:18:24 +0000 (17:18 +0100)]
confile: cleanup get_config_seccomp_allow_nesting()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:17:52 +0000 (17:17 +0100)]
confile: cleanup get_config_hooks()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:16:56 +0000 (17:16 +0100)]
confile: cleanup get_config_idmaps()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:16:28 +0000 (17:16 +0100)]
confile: cleanup __get_config_cgroup_controller()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:15:44 +0000 (17:15 +0100)]
confile: set_config_no_new_privs()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:14:33 +0000 (17:14 +0100)]
confile: cleanup set_config_log_syslog()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:14:13 +0000 (17:14 +0100)]
confile: cleanup set_config_ephemeral()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:13:28 +0000 (17:13 +0100)]
confile: cleanup clone_update_unexp_hooks()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:13:05 +0000 (17:13 +0100)]
confile: cleanup clone_update_unexp_ovl_paths()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:11:53 +0000 (17:11 +0100)]
confile: cleanup write_config()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:11:14 +0000 (17:11 +0100)]
confile: cleanup lxc_fill_elevated_privileges()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:10:41 +0000 (17:10 +0100)]
confile: cleanup lxc_config_parse_arch()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:09:13 +0000 (17:09 +0100)]
confile: cleanup lxc_config_define_add()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 16:08:22 +0000 (17:08 +0100)]
confile: cleanup parse_new_conf_line()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 15:44:36 +0000 (16:44 +0100)]
confile: cleanup parse_line()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 15:18:13 +0000 (16:18 +0100)]
confile: cleanup set_config_time_offset_monotonic()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 15:17:34 +0000 (16:17 +0100)]
confile: cleanup set_config_time_offset_boot()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 15:16:38 +0000 (16:16 +0100)]
confile: cleanup set_config_namespace_keep()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 15:14:59 +0000 (16:14 +0100)]
confile: cleanup set_config_namespace_clone()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 15:13:41 +0000 (16:13 +0100)]
confile: cleanup set_config_uts_name()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 15:12:35 +0000 (16:12 +0100)]
confile: cleanup set_config_rootfs_options()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 15:10:13 +0000 (16:10 +0100)]
confile: cleanup set_config_rootfs_path()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:54:49 +0000 (15:54 +0100)]
confile: cleanup do_includedir()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:53:49 +0000 (15:53 +0100)]
confile: cleanup append_unexp_config_line()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:52:58 +0000 (15:52 +0100)]
confile: cleanup set_config_console_size()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:52:16 +0000 (15:52 +0100)]
confile: cleanup set_config_console_buffer_size()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:49:31 +0000 (15:49 +0100)]
confile: cleanup set_config_console_rotate()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:48:30 +0000 (15:48 +0100)]
confile: cleanup set_config_cap_drop()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:46:42 +0000 (15:46 +0100)]
confile: cleanup set_config_cap_keep()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:44:34 +0000 (15:44 +0100)]
confile: cleanup set_config_mount()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:39:35 +0000 (15:39 +0100)]
confile: cleanup set_config_mount_auto()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:24:25 +0000 (15:24 +0100)]
confile: cleanup set_config_mount_fstab()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:23:51 +0000 (15:23 +0100)]
confile: cleanup set_config_idmaps()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:19:33 +0000 (15:19 +0100)]
confile: cleanup set_config_proc()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:13:41 +0000 (15:13 +0100)]
confile: cleanup set_config_sysctl()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:09:37 +0000 (15:09 +0100)]
confile: cleanup set_config_prlimit()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:04:31 +0000 (15:04 +0100)]
confile: cleanup set_config_cgroup_relative()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 14:03:15 +0000 (15:03 +0100)]
confile: cleanup __set_config_cgroup_controller()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:53:52 +0000 (14:53 +0100)]
confile: cleanup set_config_signal_stop()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:53:32 +0000 (14:53 +0100)]
confile: cleanup set_config_signal_reboot()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:53:11 +0000 (14:53 +0100)]
confile: cleanup set_config_signal_halt()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:52:42 +0000 (14:52 +0100)]
confile: cleanup set_config_log_level()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:52:05 +0000 (14:52 +0100)]
confile: cleanup set_config_log_level()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:51:22 +0000 (14:51 +0100)]
confile: cleanup set_config_log_file()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:50:25 +0000 (14:50 +0100)]
confile: cleanup set_config_apparmor_raw()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:48:33 +0000 (14:48 +0100)]
confile: cleanup set_config_apparmor_allow_nesting()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:47:46 +0000 (14:47 +0100)]
confile: cleanup set_config_apparmor_allow_incomplete()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:46:54 +0000 (14:46 +0100)]
confile: cleanup set_config_tty_max()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:46:30 +0000 (14:46 +0100)]
confile: cleanup set_config_environment()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:43:50 +0000 (14:43 +0100)]
confile: cleanup set_config_group()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:39:49 +0000 (14:39 +0100)]
confile: cleanup set_config_monitor_signal_pdeath()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:38:57 +0000 (14:38 +0100)]
confile: cleanup set_config_monitor()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:38:16 +0000 (14:38 +0100)]
confile: cleanup set_config_start()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:36:17 +0000 (14:36 +0100)]
confile: cleanup set_config_pty_max()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 13:34:06 +0000 (14:34 +0100)]
confile: cleanup set_config_personality()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Wolfgang Bumiller [Tue, 8 Dec 2020 13:36:47 +0000 (14:36 +0100)]
Merge pull request #3594 from brauner/2020-12-08/fixes
tree-wide: fixes and cleanups
Christian Brauner [Tue, 8 Dec 2020 11:19:04 +0000 (12:19 +0100)]
confile: clean up hooks
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 11:05:47 +0000 (12:05 +0100)]
confile: clean up network configuration parsing
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 8 Dec 2020 10:53:54 +0000 (11:53 +0100)]
tree-wide: use call_cleaner(netns_freeifaddrs)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Mon, 7 Dec 2020 15:25:54 +0000 (10:25 -0500)]
Merge pull request #3593 from brauner/2020-12-07/bugfixes
2020 12 07/bugfixes
Christian Brauner [Mon, 7 Dec 2020 10:28:42 +0000 (11:28 +0100)]
macro: bump MAX_GRBUF_SIZE to 2 mb
Closes #3592.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 7 Dec 2020 10:25:58 +0000 (11:25 +0100)]
macro: move MAX_GRBUF_SIZE
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 2 Dec 2020 16:06:46 +0000 (11:06 -0500)]
Merge pull request #3589 from tych0/fix-nonet-cleanup
network: fix LXC_NET_NONE cleanup
Tycho Andersen [Wed, 2 Dec 2020 14:26:18 +0000 (06:26 -0800)]
network: fix LXC_NET_NONE cleanup
We have a case where we have a nested container with LXC_NET_NONE run
inside a container that's *also* got no network namespace (run by
lxc-usernsexec).
The "am I root" check in this function then does not suffice, since the
euid of the task is 0 but it does not have privilege over its network
namespace, and thus cannot do any of the restore operations:
lxc foo
20201201232059 .271 TRACE network - network.c:lxc_restore_phys_nics_to_netns:3299 - Moving physical network devices back to parent network namespace
lxc foo
20201201232059 .271 ERROR network - network.c:lxc_restore_phys_nics_to_netns:3307 - Operation not permitted - Failed to enter network namespace
lxc foo
20201201232059 .271 ERROR start - start.c:__lxc_start:2045 - Failed to move physical network devices back to parent network namespace
Let's check that we indeed did clone the network namespace, and thus have
things to restore to their correct namespace before attempting to actually
restore them.
I suspect it's possible we can also get rid of some of the network namespace
preservation stuff in start.c in the LXC_NET_NONE case.
Signed-off-by: Tycho Andersen <tycho@tycho.pizza>
Stéphane Graber [Sat, 21 Nov 2020 15:56:16 +0000 (10:56 -0500)]
Merge pull request #3586 from tenforward/japanese
doc: Add lxc.cgroup.dir.monitor.pivot to Japanese man page
KATOH Yasufumi [Sat, 21 Nov 2020 15:26:35 +0000 (00:26 +0900)]
doc: Add lxc.cgroup.dir.monitor.pivot to Japanese man page
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Stéphane Graber [Wed, 18 Nov 2020 21:33:10 +0000 (16:33 -0500)]
Merge pull request #3583 from brauner/2020-11-18/fixes
commands_utils: fix lxc-wait
Christian Brauner [Wed, 18 Nov 2020 20:06:37 +0000 (21:06 +0100)]
commands_utils: fix lxc-wait
Closes: #3570
Fixes: 7792a5b60f79 ("commands: add additional check to lxc_cmd_sock_get_state()")
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 17 Nov 2020 23:22:50 +0000 (18:22 -0500)]
Merge pull request #3582 from brauner/2020-11-17/bugfixes
file_utils: fix config file parsing
Christian Brauner [Tue, 17 Nov 2020 21:34:05 +0000 (22:34 +0100)]
file_utils: fix config file parsing
We accidently used the "bytes_to_write" variable after we've written all the
bytes at which point it is guaranteed to be 0. Let's use the "bytes_read"
variable instead.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Mon, 16 Nov 2020 14:50:14 +0000 (09:50 -0500)]
Merge pull request #3581 from brauner/2020-11-16/fixes
conf: improve mountinfo and config parsing
Christian Brauner [Mon, 16 Nov 2020 11:30:18 +0000 (12:30 +0100)]
conf: switch to fd_to_fd() when copying mountinfo
Closes: #3580.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=209971
Suggested-by: Joan Bruguera <joanbrugueram@gmail.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 16 Nov 2020 11:18:14 +0000 (12:18 +0100)]
parse: rework config parsing routine
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 13 Nov 2020 15:03:48 +0000 (16:03 +0100)]
Merge pull request #3579 from lifeng68/master
cgfsng: adjust log level to warn instead of error
lifeng68 [Fri, 13 Nov 2020 05:49:21 +0000 (13:49 +0800)]
cgfsng: adjust log level to warn instead of error
Signed-off-by: lifeng68 <lifeng68@huawei.com>