proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 11:13:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,961 Commits 6 Branches 17 Tags 29 MiB
a579fa51bf
Commit Graph

6961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Brauner
fb87aa6a94
conf: s/peerpty/proxy/ 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:50:22 +01:00
Christian Brauner
0ed9b1bc5c
tree-wide: console.<c,h> -> terminal.<c,h> 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:49:54 +01:00
Christian Brauner
5b55021fa9
console: struct lxc_terminal_state 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:49:51 +01:00
Christian Brauner
0e4be3cf03
console: s/tty_info/ttys/g 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:42:37 +01:00
Christian Brauner
2520facd01
console: s/pty_info/tty/g 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:42:36 +01:00
Christian Brauner
13bb312d24
console: move struct lxc_terminal{_info} 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:42:36 +01:00
Christian Brauner
99a04585ab
tree-wide: struct lxc_terminal_info 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:42:13 +01:00
Christian Brauner
dcad02f87b
tree-wide: s/struct lxc_pty/lxc_terminal/g 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:35:52 +01:00
Christian Brauner
2f835b4b72
console: lxc_terminal_map_ids() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:34:27 +01:00
Christian Brauner
aed105d52a
console: lxc_terminal_conf_free() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:34:26 +01:00
Christian Brauner
fc26f08602
console: lxc_terminal_init() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:34:26 +01:00
Christian Brauner
780a7c8228
console: lxc_terminal_info_init() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:34:26 +01:00
Christian Brauner
96eee56430
console: lxc_terminal_create() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:33:38 +01:00
Christian Brauner
564e31c4b0
console: lxc_terminal_setup() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:33:38 +01:00
Christian Brauner
2083d59d98
console: s/console/terminal/g 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:33:36 +01:00
Christian Brauner
c86e25841c
console: lxc_terminal_getfd() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:25:05 +01:00
Christian Brauner
ee9102ff6e
console: lxc_terminal_master_cb() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:25:04 +01:00
Christian Brauner
52f9292f7e
console: lxc_terminal_stdin_cb() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:25:04 +01:00
Christian Brauner
ae6d39133f
console: lxc_terminal_set_stdfds() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:25:04 +01:00
Christian Brauner
548029fa07
console: lxc_terminal_create() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:25:04 +01:00
Christian Brauner
43366ca259
console: lxc_terminal_create_log_file() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:25:04 +01:00
Christian Brauner
9bc780839b
console: lxc_terminal_create_ringbuf() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:23:21 +01:00
Christian Brauner
2aac071b31
console: lxc_terminal_delete() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:19:35 +01:00
Christian Brauner
a8e363881e
console: lxc_terminal_init() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:19:35 +01:00
Christian Brauner
7ef7427e3d
console: lxc_terminal_write_ringbuffer() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:19:35 +01:00
Christian Brauner
7c716661dc
console: lxc_terminal_peer_default() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:18:13 +01:00
Christian Brauner
3dfe6f8dac
console: lxc_terminal_free() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:18:13 +01:00
Christian Brauner
c1ee47cd79
console: lxc_terminal_allocate() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:18:12 +01:00
Christian Brauner
93ed49903f
console: lxc_terminal_peer_proxy_alloc() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:18:12 +01:00
Christian Brauner
ec2a5cfc58
console: lxc_terminal_peer_proxy_free() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:18:12 +01:00
Christian Brauner
093bce5f66
console: lxc_terminal_mainloop_add() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:18:12 +01:00
Christian Brauner
22b183eafb
console: lxc_terminal_mainloop_add_peer() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:18:12 +01:00
Christian Brauner
de708fb77c
console: lxc_terminal_io_cb() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:18:09 +01:00
Christian Brauner
a8867251bc
console: lxc_terminal_signal_fini() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:15:21 +01:00
Christian Brauner
dc8c788350
console: lxc_terminal_signal_init() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:15:21 +01:00
Christian Brauner
9bafc8cb14
console: lxc_terminal_signalfd_cb() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:15:21 +01:00
Christian Brauner
8ccbbf9404
commands: lxc_cmd_terimal_winch() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:15:21 +01:00
Christian Brauner
dad4a0390d
console: lxc_terminal_sigwinch() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:15:21 +01:00
Christian Brauner
7a10164ad8
console: lxc_terminal_winch() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:15:20 +01:00
Christian Brauner
4e9c033073
console: lxc_terminal_winsz() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:15:20 +01:00
Christian Brauner
9785b5398c
tree-wide: s/struct lxc_console/struct lxc_pty/g 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:15:18 +01:00
Christian Brauner
93677636e2
cgfsng: non-functional changes 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 22:09:24 +01:00
Stéphane Graber
7263b97f2c
Merge pull request #2167 from brauner/2018-02-15/simplify_console_logging 
console: simplify console logging
 2018-02-27 16:07:56 -05:00
Christian Brauner
d931b24349
Merge pull request #2194 from hallyn/2018-02-27/lxcinit-umountdev 
lxc_init: don't mount filesystems
 2018-02-27 22:04:55 +01:00
Serge Hallyn
0011e0975c 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>
 2018-02-27 14:50:48 -06:00
Christian Brauner
89962c6c0c
console: always dump log file 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-02-27 21:42:18 +01:00
Christian Brauner
39c6cdb771
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>
 2018-02-27 21:38:31 +01:00
Christian Brauner
23e0d9af76
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>
 2018-02-27 21:38:31 +01:00
Christian Brauner
861813e52b
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>
 2018-02-27 21:38:29 +01:00
Stéphane Graber
9e49a491de
libpam: Drop mention to non-existing macro.h 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 2018-02-26 13:22:02 -05:00