]>
git.proxmox.com Git - mirror_lxc.git/log
Christian Brauner [Fri, 2 Mar 2018 11:18:38 +0000 (12:18 +0100)]
CODING_STYLE: remove duplicate _exit() entry
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 2 Mar 2018 09:37:03 +0000 (10:37 +0100)]
Merge pull request #2201 from tenforward/japanese
doc: Add lxc.console.size and remove lxc.console.buffer.logfile in Japanese man page
KATOH Yasufumi [Fri, 2 Mar 2018 06:09:34 +0000 (15:09 +0900)]
doc: Add lxc.console.size and remove lxc.console.buffer.logfile in Japanese man pages
Update for commit
861813e and
23e0d9a for lxc.container.conf(5)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Stéphane Graber [Thu, 1 Mar 2018 18:55:43 +0000 (13:55 -0500)]
Release LXC 3.0.0.beta1
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Thu, 1 Mar 2018 17:09:32 +0000 (12:09 -0500)]
Merge pull request #2199 from brauner/2018-03-01/bugfixes
start: handle kernels without setns support
Christian Brauner [Thu, 1 Mar 2018 16:09:44 +0000 (17:09 +0100)]
config: start with a full capability set
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 1 Mar 2018 11:12:50 +0000 (12:12 +0100)]
start: handle kernels without setns support
Closes #1390.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 1 Mar 2018 10:52:49 +0000 (11:52 +0100)]
attach: rename to LXC_ATTACH_TERMINAL
Rename from LXC_ATTACH_ALLOCATE_PTY to LXC_ATTACH_TERMINAL. The latter is
shorter and more generic. I don't want this whole terminology of ptys, ttys,
and consoles to leak through the API.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 1 Mar 2018 07:23:02 +0000 (08:23 +0100)]
Merge pull request #2197 from stgraber/master
Fix typo
Stéphane Graber [Thu, 1 Mar 2018 06:31:50 +0000 (01:31 -0500)]
Fix typo
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Wed, 28 Feb 2018 19:13:52 +0000 (14:13 -0500)]
Merge pull request #2164 from brauner/2018-02-14/add_flag_to_compile_tools
tree-wide: rm {lua,python3} bindings, rm deprecated binaries, rm deprecated templates, add --{disable,enable}-{commands,tools} flag
Serge Hallyn [Wed, 28 Feb 2018 16:18:39 +0000 (10:18 -0600)]
Merge pull request #2196 from brauner/2018-02-28/more_terminal_fixes
terminal: improvements and cleanup
Christian Brauner [Wed, 28 Feb 2018 12:02:05 +0000 (13:02 +0100)]
terminal: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:51:05 +0000 (12:51 +0100)]
terminal: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:49:45 +0000 (12:49 +0100)]
terminal: lxc_terminal_map_ids()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:48:28 +0000 (12:48 +0100)]
terminal: lxc_terminal_prepare_login()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:46:36 +0000 (12:46 +0100)]
terminal: lxc_make_controlling_terminal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:45:07 +0000 (12:45 +0100)]
terminal: lxc_console()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:43:47 +0000 (12:43 +0100)]
terminal: lxc_terminal_master_cb()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:42:31 +0000 (12:42 +0100)]
terminal: lxc_terminal_stdin_cb()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:40:43 +0000 (12:40 +0100)]
terminal: lxc_terminal_set_stdfds()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:23:06 +0000 (12:23 +0100)]
terminal: lxc_terminal_setup()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:22:23 +0000 (12:22 +0100)]
terminal: lxc_terminal_create()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:20:02 +0000 (12:20 +0100)]
terminal: lxc_terminal_peer_default()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:14:04 +0000 (12:14 +0100)]
terminal: lxc_terminal_free()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:12:59 +0000 (12:12 +0100)]
terminal: lxc_terminal_allocate()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:11:16 +0000 (12:11 +0100)]
terminal: lxc_terminal_peer_proxy_alloc()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:04:58 +0000 (12:04 +0100)]
terminal: lxc_terminal_peer_proxy_free()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:02:51 +0000 (12:02 +0100)]
terminal: lxc_setup_tios()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 11:00:14 +0000 (12:00 +0100)]
terminal: lxc_terminal_mainloop_add()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 10:58:50 +0000 (11:58 +0100)]
terminal: lxc_terminal_io_cb()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 10:56:55 +0000 (11:56 +0100)]
terminal: lxc_terminal_write_log_file()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 10:51:21 +0000 (11:51 +0100)]
terminal: error out when SIGTERM cannot be added
This should be an error condition.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 10:51:04 +0000 (11:51 +0100)]
terminal: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 10:50:38 +0000 (11:50 +0100)]
terminal: lxc_terminal_signalfd_cb()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 28 Feb 2018 10:50:12 +0000 (11:50 +0100)]
mainloop: add LXC_MAINLOOP_ERROR
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 27 Feb 2018 13:12:50 +0000 (14:12 +0100)]
lxc-local: add --mapped-{g,u}id flags
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
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>