]>
git.proxmox.com Git - mirror_lxc.git/log
Christian Brauner [Tue, 27 Feb 2018 11:21:02 +0000 (12:21 +0100)]
lxc-oci: make shellcheck clean
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 10:55:22 +0000 (11:55 +0100)]
lxc-local: coding style
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 10:46:33 +0000 (11:46 +0100)]
lxc-busybox: make shellcheck clean
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 09:47:34 +0000 (10:47 +0100)]
lxc-download: make POSIX shellcheck clean
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 00:28:45 +0000 (01:28 +0100)]
templates: bump compat level to 5
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 26 Feb 2018 20:12:17 +0000 (21:12 +0100)]
tree-wide: rm templates in favor of distrobuilder
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 14 Feb 2018 10:57:47 +0000 (11:57 +0100)]
autotools: remove --enable-deprecated
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 14 Feb 2018 10:53:18 +0000 (11:53 +0100)]
tree-wide: remove python3 bindings
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 14 Feb 2018 10:48:20 +0000 (11:48 +0100)]
tree-wide: remove lua bindings
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 14 Feb 2018 10:45:09 +0000 (11:45 +0100)]
tree-wide: cleanup
- remove legacy binaries
- conditionalize creation of docs and tests for the command line tools and the
shared library helper commands
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 14 Feb 2018 10:33:33 +0000 (11:33 +0100)]
autotools: add --{enable,disable}-{commands,tools}
This allows users to only compile the shared libray without having to compile
any of the command line tools or command helpers for the shared library.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Serge Hallyn [Tue, 27 Feb 2018 22:10:33 +0000 (16:10 -0600)]
Merge pull request #2193 from brauner/2018-02-27/naming_tweaks
tree-wide: introduce consistent and agnostic naming for ptys, ttys, and consoles
Christian Brauner [Tue, 27 Feb 2018 21:52:28 +0000 (22:52 +0100)]
terminal: lxc_terminal_write_log_file()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 21:52:03 +0000 (22:52 +0100)]
terminal: lxc_terminal_rotate_log_file()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 17:42:25 +0000 (18:42 +0100)]
conf: s/peerpty/proxy/
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 17:31:31 +0000 (18:31 +0100)]
tree-wide: console.<c,h> -> terminal.<c,h>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 17:25:41 +0000 (18:25 +0100)]
console: struct lxc_terminal_state
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 17:23:07 +0000 (18:23 +0100)]
console: s/tty_info/ttys/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 17:20:00 +0000 (18:20 +0100)]
console: s/pty_info/tty/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 17:15:45 +0000 (18:15 +0100)]
console: move struct lxc_terminal{_info}
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:58:34 +0000 (17:58 +0100)]
tree-wide: struct lxc_terminal_info
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:52:55 +0000 (17:52 +0100)]
tree-wide: s/struct lxc_pty/lxc_terminal/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:15:06 +0000 (17:15 +0100)]
console: lxc_terminal_map_ids()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:14:03 +0000 (17:14 +0100)]
console: lxc_terminal_conf_free()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:11:44 +0000 (17:11 +0100)]
console: lxc_terminal_init()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:10:58 +0000 (17:10 +0100)]
console: lxc_terminal_info_init()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:09:38 +0000 (17:09 +0100)]
console: lxc_terminal_create()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:08:46 +0000 (17:08 +0100)]
console: lxc_terminal_setup()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 16:05:43 +0000 (17:05 +0100)]
console: s/console/terminal/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:58:49 +0000 (16:58 +0100)]
console: lxc_terminal_getfd()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:58:02 +0000 (16:58 +0100)]
console: lxc_terminal_master_cb()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:55:56 +0000 (16:55 +0100)]
console: lxc_terminal_stdin_cb()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:53:18 +0000 (16:53 +0100)]
console: lxc_terminal_set_stdfds()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:51:40 +0000 (16:51 +0100)]
console: lxc_terminal_create()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:50:08 +0000 (16:50 +0100)]
console: lxc_terminal_create_log_file()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:49:28 +0000 (16:49 +0100)]
console: lxc_terminal_create_ringbuf()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:48:21 +0000 (16:48 +0100)]
console: lxc_terminal_delete()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:47:19 +0000 (16:47 +0100)]
console: lxc_terminal_init()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:46:05 +0000 (16:46 +0100)]
console: lxc_terminal_write_ringbuffer()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:44:57 +0000 (16:44 +0100)]
console: lxc_terminal_peer_default()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:42:30 +0000 (16:42 +0100)]
console: lxc_terminal_free()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:38:12 +0000 (16:38 +0100)]
console: lxc_terminal_allocate()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:36:49 +0000 (16:36 +0100)]
console: lxc_terminal_peer_proxy_alloc()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:36:09 +0000 (16:36 +0100)]
console: lxc_terminal_peer_proxy_free()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:34:55 +0000 (16:34 +0100)]
console: lxc_terminal_mainloop_add()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:34:00 +0000 (16:34 +0100)]
console: lxc_terminal_mainloop_add_peer()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:31:22 +0000 (16:31 +0100)]
console: lxc_terminal_io_cb()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:29:23 +0000 (16:29 +0100)]
console: lxc_terminal_signal_fini()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:28:15 +0000 (16:28 +0100)]
console: lxc_terminal_signal_init()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:26:25 +0000 (16:26 +0100)]
console: lxc_terminal_signalfd_cb()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:21:15 +0000 (16:21 +0100)]
commands: lxc_cmd_terimal_winch()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:12:51 +0000 (16:12 +0100)]
console: lxc_terminal_sigwinch()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:11:08 +0000 (16:11 +0100)]
console: lxc_terminal_winch()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 15:09:32 +0000 (16:09 +0100)]
console: lxc_terminal_winsz()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 14:57:31 +0000 (15:57 +0100)]
tree-wide: s/struct lxc_console/struct lxc_pty/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 14:57:16 +0000 (15:57 +0100)]
cgfsng: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 27 Feb 2018 21:07:56 +0000 (16:07 -0500)]
Merge pull request #2167 from brauner/2018-02-15/simplify_console_logging
console: simplify console logging
Christian Brauner [Tue, 27 Feb 2018 21:04:55 +0000 (22:04 +0100)]
Merge pull request #2194 from hallyn/2018-02-27/lxcinit-umountdev
lxc_init: don't mount filesystems
Serge Hallyn [Tue, 27 Feb 2018 18:05:30 +0000 (12:05 -0600)]
lxc_init: don't mount filesystems
We have an extensive set of container config options to do this
for us, and doing this unconditionally breaks several use cases.
For instance, if we want to bind mount a /dev/shm using the
container configuration, then lxc-execute, then lxc-init will
rudely unmount the /dev/shm and remount it as a private tmpfs.
Signed-off-by: Serge Hallyn <shallyn@cisco.com>
Christian Brauner [Tue, 27 Feb 2018 20:42:18 +0000 (21:42 +0100)]
console: always dump log file
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 15 Feb 2018 17:55:58 +0000 (18:55 +0100)]
console: dump ringbuffer to disk on container exit
The console ringbuffer will be dumped to disk if the console log file is not
rotated and it's size is not unlimited. In the former two cases we will have
all data from the ringbuffer available anyway.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 15 Feb 2018 13:05:35 +0000 (14:05 +0100)]
confile: remove lxc.console.buffer.logfile
All of its functionality is now covered over by lxc.console.logfile.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 15 Feb 2018 10:27:56 +0000 (11:27 +0100)]
confile: add lxc.console.size
lxc.console.size regulates the size of the console log file. This is intended
to replace lxc.console.buffer.logfile. The current semantics are:
- if lxc.console.size is not set:
- no limit is placed on the size of the log file
- if lxc.console.size is set:
- if lxc.console.rotate is set and the next write would exceed the limit:
- write as much as possible into the old log file
- rotate the log file
- write as much as posible into the new log file
- discard remaining bytes (scenario shouldn't be possible in normal
circumstances)
- if lxc.console.rotate is not set and the next write would exceed the limit:
- keep overwriting the current log file
To make the log file a mirror of the in-memory ringbuffer simply set:
lxc.console.buffer.size == lxc.console.size.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Mon, 26 Feb 2018 18:22:02 +0000 (13:22 -0500)]
libpam: Drop mention to non-existing macro.h
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Mon, 26 Feb 2018 17:11:13 +0000 (12:11 -0500)]
Merge pull request #2192 from brauner/2018-02-26/enable_pam_flag
configure: add --enable-pam
Stéphane Graber [Mon, 26 Feb 2018 16:38:13 +0000 (11:38 -0500)]
Merge pull request #2190 from brauner/2018-02-16/lxc_local_template
templates: add lxc-local template
Christian Brauner [Mon, 26 Feb 2018 15:57:03 +0000 (16:57 +0100)]
configure: add --enable-pam
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 26 Feb 2018 11:49:10 +0000 (12:49 +0100)]
templates: add lxc-local template
Closes #2184.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 26 Feb 2018 11:48:08 +0000 (12:48 +0100)]
lxc-oci: remove executable bit
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 26 Feb 2018 15:54:57 +0000 (16:54 +0100)]
Revert "Revert "pam: create writable cgroups for unpriv users""
This reverts commit
79cf25e826509e61cdda4c47d5aeb0e222439970 .
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Mon, 26 Feb 2018 15:35:22 +0000 (10:35 -0500)]
Merge pull request #2191 from brauner/2018-02-16/fix_snapshot_segfault
lxc-snapshot: fix segfault
Stéphane Graber [Mon, 26 Feb 2018 15:34:56 +0000 (10:34 -0500)]
Merge pull request #2189 from brauner/2018-02-16/remove_needless_locking
commands: remove mutex from state client list
Stéphane Graber [Mon, 26 Feb 2018 15:33:28 +0000 (10:33 -0500)]
Merge pull request #2188 from brauner/2018-02-16/coding_style
CODING_STYLE: add section about _exit()
Christian Brauner [Mon, 26 Feb 2018 14:30:56 +0000 (15:30 +0100)]
lxc-snapshot: fix segfault
https://bugs.launchpad.net/ubuntu/+source/lxc/+bug/
1751780
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 26 Feb 2018 13:03:00 +0000 (14:03 +0100)]
parse: error out on invalid config key
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 26 Feb 2018 10:43:42 +0000 (11:43 +0100)]
commands: remove mutex from state client list
I was thinking about the locking here yesterday and it dawned on me that we
actually don't need this at all:
- possible contention between traversing list to send states to state clients
and adding new state clients to the list:
It is the command handler that adds new state clients to the state client
list. The command handler and the code that actually sends out the container
states run in the same process so there's not contention and thus no locking
needed.
- adding state clients to the list from multiple threads:
The command handler itself is single-threaded so only one thread's request can
be served at the same time so no locking is needed.
- sending out the state to state clients via the command handler itself:
The state client also adds and removes state clients from the state client
list so there's no locking needed.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 26 Feb 2018 10:21:51 +0000 (11:21 +0100)]
CODING_STYLE: add section about _exit()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Sun, 25 Feb 2018 22:17:19 +0000 (17:17 -0500)]
Merge pull request #2187 from itoffshore/alpine
fix download template for /tmp as tmpfs or noexec
Stuart Cardall [Sun, 25 Feb 2018 11:50:13 +0000 (11:50 +0000)]
fix download template for /tmp as tmpfs or noexec
* prepend $LXC_PATH to $DOWNLOAD_TEMP on systems with /tmp mounted
securely as a small tmpfs / noexec
* gpg_setup() creates $DOWNLOAD_TEMP so remove superflous mkdir
* fixes https://github.com/lxc/lxc/issues/516
Signed-off-by: Stuart Cardall <developer@it-offshore.co.uk>
Stéphane Graber [Sun, 25 Feb 2018 16:40:57 +0000 (11:40 -0500)]
Merge pull request #2186 from brauner/2018-02-22/make_confile_reading_thread_safe
tree-wide: thread-safety improvements
Christian Brauner [Sat, 24 Feb 2018 20:36:20 +0000 (21:36 +0100)]
cgfsng: fix get_hierarchy() for unified hierarchy
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 19:12:51 +0000 (20:12 +0100)]
criu: du_dump()
thread-safety: s/exit()/_exit()/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 19:12:16 +0000 (20:12 +0100)]
criu: do_restore()
thread-safety: s/exit()/_exit()/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 19:11:45 +0000 (20:11 +0100)]
criu: criu_version_ok()
thread-safety: s/exit()/_exit()/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 19:11:04 +0000 (20:11 +0100)]
criu: __criu_check_feature()
thread-safety: s/exit()/_exit()/g
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:30:56 +0000 (15:30 +0100)]
lxccontainer: create_container_dir()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:29:33 +0000 (15:29 +0100)]
lxccontainer: do_create_container_dir()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:26:35 +0000 (15:26 +0100)]
lxccontainer: lxcapi_startl()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:25:44 +0000 (15:25 +0100)]
lxccontainer: lxcapi_start()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:24:47 +0000 (15:24 +0100)]
lxccontainer: free_init_cmd()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:24:29 +0000 (15:24 +0100)]
lxccontainer: split_init_cmd()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:23:03 +0000 (15:23 +0100)]
lxccontainer: push_arg()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:22:38 +0000 (15:22 +0100)]
lxccontainer: am_single_threaded()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:22:04 +0000 (15:22 +0100)]
lxccontainer: do_lxcapi_wait()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:21:38 +0000 (15:21 +0100)]
lxccontainer: do_lxcapi_want_close_all_fds()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:21:16 +0000 (15:21 +0100)]
lxccontainer: do_lxcapi_want_daemonize()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:20:50 +0000 (15:20 +0100)]
lxccontainer: do_lxcapi_load_config()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:19:59 +0000 (15:19 +0100)]
lxccontainer: load_config_locked()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:19:19 +0000 (15:19 +0100)]
lxccontainer: lxcapi_console()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 24 Feb 2018 14:18:55 +0000 (15:18 +0100)]
lxccontainer: do_lxcapi_console_getfd()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>