]>
git.ipfire.org Git - thirdparty/lxc.git/log
Christian Brauner [Tue, 30 May 2017 11:29:46 +0000 (13:29 +0200)]
utils: add lxc_safe_ulong()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 03:02:55 +0000 (05:02 +0200)]
confile: config_no_new_privs()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 03:01:30 +0000 (05:01 +0200)]
confile: config_ephemeral()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:59:02 +0000 (04:59 +0200)]
confile: config_utsname()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:58:03 +0000 (04:58 +0200)]
confile: config_includefile()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:54:21 +0000 (04:54 +0200)]
confile: config_fstab()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:50:09 +0000 (04:50 +0200)]
confile: config_stopsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:49:29 +0000 (04:49 +0200)]
confile: config_rebootsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:48:02 +0000 (04:48 +0200)]
confile: config_haltsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:44:48 +0000 (04:44 +0200)]
confile: config_autodev()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:43:36 +0000 (04:43 +0200)]
confile: config_loglevel()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:41:17 +0000 (04:41 +0200)]
confile: config_lsm_aa_incomplete()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:40:12 +0000 (04:40 +0200)]
confile: config_kmsg()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:39:12 +0000 (04:39 +0200)]
confile: config_tty()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:38:05 +0000 (04:38 +0200)]
confile: config_monitor()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:35:17 +0000 (04:35 +0200)]
confile: config_start()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:30:29 +0000 (04:30 +0200)]
confile: config_pts()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:27:39 +0000 (04:27 +0200)]
confile: config_init_gid()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:25:38 +0000 (04:25 +0200)]
confile: config_init_uid()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 02:16:34 +0000 (04:16 +0200)]
conf: move clearing config items into one place
Let's place lxc_get_config_item() and lxc_clear_config_item() into a single
place. This causes less confusion, less looking around and makes it clear that
both must be implemented when adding new configuration items.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 01:49:54 +0000 (03:49 +0200)]
confile: config_syslog()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Tue, 30 May 2017 01:19:26 +0000 (03:19 +0200)]
confile: do not write out trailing spaces
So far do_append_unexp_config_line() wrote out a trailing space each time the
config item value was empty. This is a problem a) when we later on parse the
written out config file we need to remove trailing spaces and b).
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 14:29:02 +0000 (16:29 +0200)]
conf: clear lxc.syslog
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:40:34 +0000 (15:40 +0200)]
conf: clear lxc.include
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:08:02 +0000 (15:08 +0200)]
confile: config_no_new_privs()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:07:48 +0000 (15:07 +0200)]
confile: config_syslog()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:07:24 +0000 (15:07 +0200)]
confile: config_ephemeral()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:04:40 +0000 (15:04 +0200)]
confile: config_utsname()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:04:00 +0000 (15:04 +0200)]
confile: config_rootfs_backend()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:03:24 +0000 (15:03 +0200)]
confile: config_includefile()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:01:28 +0000 (15:01 +0200)]
confile: config_stopsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 13:00:56 +0000 (15:00 +0200)]
confile: config_rebootsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:59:21 +0000 (14:59 +0200)]
confile: config_haltsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:58:24 +0000 (14:58 +0200)]
confile: config_haltsignal()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:57:54 +0000 (14:57 +0200)]
confile: sig_num()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:56:16 +0000 (14:56 +0200)]
confile: config_autodev()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:55:43 +0000 (14:55 +0200)]
confile: config_lsm_aa_incomplete()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:55:25 +0000 (14:55 +0200)]
confile: config_ttydir()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:54:49 +0000 (14:54 +0200)]
confile: config_tty()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:54:23 +0000 (14:54 +0200)]
confile: config_monitor()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:53:58 +0000 (14:53 +0200)]
confile: config_start()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:53:07 +0000 (14:53 +0200)]
confile: config_personality()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:52:07 +0000 (14:52 +0200)]
confile: config_init_gid()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:51:28 +0000 (14:51 +0200)]
confile: config_init_uid()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:41:02 +0000 (14:41 +0200)]
confile: config_cap_drop()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:40:47 +0000 (14:40 +0200)]
confile: config_cap_keep()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:40:32 +0000 (14:40 +0200)]
confile: config_mount()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:40:18 +0000 (14:40 +0200)]
confile: config_mount_auto()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:39:56 +0000 (14:39 +0200)]
confile: config_fstab()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:39:33 +0000 (14:39 +0200)]
confile: config_idmap()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:39:15 +0000 (14:39 +0200)]
confile: config_limit()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:38:50 +0000 (14:38 +0200)]
confile: config_cgroup()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:38:26 +0000 (14:38 +0200)]
confile: config_loglevel()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:37:59 +0000 (14:37 +0200)]
confile: config_environment()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:37:42 +0000 (14:37 +0200)]
confile: config_group()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:37:18 +0000 (14:37 +0200)]
confile: config_hook()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:36:36 +0000 (14:36 +0200)]
confile: config_network_ipv6_gateway()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:36:12 +0000 (14:36 +0200)]
confile: config_network_ipv6()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:35:55 +0000 (14:35 +0200)]
confile: config_network_ipv4_gateway()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:35:13 +0000 (14:35 +0200)]
confile: config_network_ipv4()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:34:34 +0000 (14:34 +0200)]
confile: config_network_hwaddr()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:32:37 +0000 (14:32 +0200)]
confile: config_network_type()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:31:58 +0000 (14:31 +0200)]
confile: config_network()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:30:04 +0000 (14:30 +0200)]
confile: config_string_item()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 29 May 2017 12:28:34 +0000 (14:28 +0200)]
confile: add config_value_empty()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Serge Hallyn [Mon, 29 May 2017 01:28:24 +0000 (20:28 -0500)]
Merge pull request #1590 from brauner/2017-05-27/new_readme
repo: add new README
Christian Brauner [Sat, 27 May 2017 01:53:59 +0000 (03:53 +0200)]
repo: add new README
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 27 May 2017 02:04:31 +0000 (12:04 +1000)]
Merge pull request #1576 from lifeng68/Modifytty
DO NOT add the handles of adjust winsize when the 'stdin' is not a tty
Christian Brauner [Tue, 23 May 2017 14:49:03 +0000 (00:49 +1000)]
Merge pull request #1585 from tenforward/japanese
doc: Add console behavior to Japanese lxc.container.conf(5)
KATOH Yasufumi [Tue, 23 May 2017 06:48:34 +0000 (15:48 +0900)]
doc: Add console behavior to Japanese lxc.container.conf(5)
Update for commit
6e3bb2890c26ff0ca8a400eb3c0777f07ff76d83
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Stéphane Graber [Mon, 22 May 2017 19:52:13 +0000 (15:52 -0400)]
Merge pull request #1580 from brauner/2017-05-20/tty_fixes
conf: non-functional changes
Stéphane Graber [Mon, 22 May 2017 19:49:54 +0000 (15:49 -0400)]
Merge pull request #1573 from brauner/2017-05-18/fix_ppc64le_build
utils: fix ppc64le builds
Christian Brauner [Sat, 20 May 2017 12:58:20 +0000 (14:58 +0200)]
conf: non-functional changes
Improve setting up /dev/tty<N> devices.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Li Feng [Sat, 20 May 2017 09:40:36 +0000 (17:40 +0800)]
DO NOT add the handles of adjust winsize when the 'stdin' is not a tty
Signed-off-by: Li Feng <lifeng68@huawei.com>
Christian Brauner [Fri, 19 May 2017 11:26:54 +0000 (13:26 +0200)]
Merge pull request #1577 from lifeng68/Bugfix
Fix the bug of 'ts->stdoutfd' did not fill with parameters 'stdoutfd'
Li Feng [Fri, 19 May 2017 14:40:07 +0000 (22:40 +0800)]
Fix the bug of 'ts->stdoutfd' did not fill with parameters 'stdoutfd'
Signed-off-by: Li Feng <lifeng68@huawei.com>
Serge Hallyn [Thu, 18 May 2017 17:45:13 +0000 (12:45 -0500)]
Merge pull request #1575 from brauner/2017-05-18/fix_tmp_mount_proc
utils: fix lxc_mount_proc_if_needed()
Christian Brauner [Thu, 18 May 2017 14:31:42 +0000 (16:31 +0200)]
utils: fix lxc_mount_proc_if_needed()
- check for buffer overflow
- only call INFO() after we ensured that readlink() was successful
- simplify logic
Reported-by: Benedikt Rosenkranz beluro@web.de
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Thu, 18 May 2017 11:18:29 +0000 (13:18 +0200)]
utils: fix ppc64le builds
I suspect that there's a glibc bug on ppc64le. Both clang and gcc a very
unhappy when you return -errno from these functions. Instead, let's return
concrete errno numbers, e.g. -EINVAL.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Wed, 17 May 2017 19:29:21 +0000 (15:29 -0400)]
Merge pull request #1570 from mgariepy/patch-2
Add cronie to the pkg list
mgariepy [Wed, 17 May 2017 19:03:20 +0000 (15:03 -0400)]
Add cronie to the pkg list
Add cronie to have crond running in the containers.
Signed-off-by: Marc Gariepy <gariepy.marc@gmail.com>
Serge Hallyn [Wed, 17 May 2017 19:01:56 +0000 (14:01 -0500)]
Merge pull request #1569 from anevenchanniy/lxc-top/fix_memsw
[lxc-top] Fix memory+swap output in batch mode
Christian Brauner [Wed, 17 May 2017 17:25:13 +0000 (19:25 +0200)]
Merge pull request #1568 from hallyn/2017-05-17/cgfsng.log
cgfsng: log when we defer to cgfsng
Nevenchanniy Aleksandr [Wed, 17 May 2017 14:50:03 +0000 (17:50 +0300)]
[lxc-top] Fix memory+swap output in batch mode
This is patch fix output of memory+swap in batch mode, that
was forgotten in
6b6e702ac83a2bc92959c0dcae5149762826ef30
Signed-off-by: Alexandr Nevenchanniy <a.nevenchannyy@gmail.com
Serge Hallyn [Wed, 17 May 2017 14:20:59 +0000 (09:20 -0500)]
cgfsng: log when we defer to cgfsng
Signed-off-by: Serge Hallyn <serge@hallyn.com>
Christian Brauner [Tue, 16 May 2017 18:23:51 +0000 (20:23 +0200)]
Merge pull request #1567 from anevenchanniy/lxc-top/memory
[lxc-top] Add memory+swap monitoring
Nevenchanniy Aleksandr [Mon, 15 May 2017 22:46:09 +0000 (01:46 +0300)]
[lxc-top] Add memory+swap monitoring
This is patch add memory + swap monitoring from lxc-top tool
Signed-off-by: Alexandr Nevenchanniy <a.nevenchannyy@gmail.com>
Serge Hallyn [Tue, 16 May 2017 14:45:30 +0000 (09:45 -0500)]
Merge pull request #1565 from brauner/2017-05-15/clear_all_config_items
conf{,ile}: allow to clear all config items
Serge Hallyn [Tue, 16 May 2017 14:39:14 +0000 (09:39 -0500)]
Merge pull request #1566 from brauner/2017-05-16/pin_rootfs_when_privileged
start: pin rootfs when privileged
Christian Brauner [Mon, 15 May 2017 22:42:30 +0000 (00:42 +0200)]
start: pin rootfs when privileged
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 15 May 2017 15:55:55 +0000 (17:55 +0200)]
Merge pull request #1563 from 0x0916/seccomp
Seccomp: update comment, print action name etc
Christian Brauner [Mon, 15 May 2017 12:53:06 +0000 (14:53 +0200)]
conf{,ile}: allow to clear all config items
Closes #1561.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
0x0916 [Mon, 15 May 2017 10:05:09 +0000 (18:05 +0800)]
seccomp: print action name in log
This patch add function `get_action_name`, so we can print action name
in the log file. for example:
```
lxc-start ubuntu
20170515095416 .561 INFO lxc_seccomp - seccomp.c:parse_config_v2:613 - Adding compat rule for reject_force_umount action 0(kill).
lxc-start ubuntu
20170515095416 .562 INFO lxc_seccomp - seccomp.c:parse_config_v2:613 - Adding compat rule for kexec_load action 327681(errno).
```
Signed-off-by: 0x0916 <w@laoqinren.net>
0x0916 [Mon, 15 May 2017 10:04:27 +0000 (18:04 +0800)]
seccomp: update comment for function `parse_config`
Signed-off-by: 0x0916 <w@laoqinren.net>
0x0916 [Mon, 15 May 2017 10:03:41 +0000 (18:03 +0800)]
seccomp: s/n-new-privs/no-new-privs/g
Signed-off-by: 0x0916 <w@laoqinren.net>
Christian Brauner [Mon, 15 May 2017 09:06:56 +0000 (11:06 +0200)]
Merge pull request #1558 from 0x0916/lxc-top
add more detail for blkio
Christian Brauner [Mon, 15 May 2017 09:06:24 +0000 (11:06 +0200)]
Merge pull request #1562 from 0x0916/delete-unneccessory-include
monitor: delete unnecessary include file
0x0916 [Mon, 15 May 2017 07:31:33 +0000 (15:31 +0800)]
monitor: delete unneccessory include file
we want to export `monitor.h`, `#include "conf.h"` will cause error
and it is unneccessory so just delete it.
Signed-off-by: 0x0916 <w@laoqinren.net>
0x0916 [Tue, 9 May 2017 11:07:24 +0000 (19:07 +0800)]
add more detail for blkio
This patch add Read and Write information for blkio bytes.
Signed-off-by: 0x0916 <w@laoqinren.net>
Christian Brauner [Sun, 14 May 2017 09:59:52 +0000 (11:59 +0200)]
Merge pull request #1560 from dimkr/master
conf: fix build without libcap