proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-11 13:43:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,283 Commits 6 Branches 17 Tags 29 MiB
cb54b5798a
Commit Graph

5283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Brauner
ff0e49c768
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>
 2017-05-18 13:18:29 +02:00
Stéphane Graber
0cb5ac09c9 Merge pull request #1570 from mgariepy/patch-2 
Add cronie to the pkg list
 2017-05-17 15:29:21 -04:00
mgariepy
c227acde21 Add cronie to the pkg list 
Add cronie to have crond running in the containers.

Signed-off-by: Marc Gariepy <gariepy.marc@gmail.com>
 2017-05-17 15:26:15 -04:00
Serge Hallyn
3877c7f0e7 Merge pull request #1569 from anevenchanniy/lxc-top/fix_memsw 
[lxc-top] Fix memory+swap output in batch mode
 2017-05-17 14:01:56 -05:00
Christian Brauner
cca2cc2879 Merge pull request #1568 from hallyn/2017-05-17/cgfsng.log 
cgfsng: log when we defer to cgfsng
 2017-05-17 19:25:13 +02:00
Nevenchanniy Aleksandr
1b67456ce9 [lxc-top] Fix memory+swap output in batch mode 
This is patch fix output of memory+swap in batch mode, that
was forgotten in 6b6e702ac8

Signed-off-by: Alexandr Nevenchanniy <a.nevenchannyy@gmail.com
 2017-05-17 17:50:03 +03:00
Serge Hallyn
5059aae905 cgfsng: log when we defer to cgfsng 
Signed-off-by: Serge Hallyn <serge@hallyn.com>
 2017-05-17 09:23:38 -05:00
Christian Brauner
1de3c9170e Merge pull request #1567 from anevenchanniy/lxc-top/memory 
[lxc-top] Add memory+swap monitoring
 2017-05-16 20:23:51 +02:00
Nevenchanniy Aleksandr
6b6e702ac8 [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>
 2017-05-16 18:50:57 +03:00
Serge Hallyn
2494c5ca31 Merge pull request #1565 from brauner/2017-05-15/clear_all_config_items 
conf{,ile}: allow to clear all config items
 2017-05-16 09:45:30 -05:00
Serge Hallyn
e863f86950 Merge pull request #1566 from brauner/2017-05-16/pin_rootfs_when_privileged 
start: pin rootfs when privileged
 2017-05-16 09:39:14 -05:00
Christian Brauner
0ee3505984
start: pin rootfs when privileged 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-16 00:42:30 +02:00
Christian Brauner
bf2146ab37 Merge pull request #1563 from 0x0916/seccomp 
Seccomp: update comment, print action name etc
 2017-05-15 17:55:55 +02:00
Christian Brauner
78625a5e3e
conf{,ile}: allow to clear all config items 
Closes #1561.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-15 15:24:17 +02:00
0x0916
4836330b1a 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>
 2017-05-15 20:45:55 +08:00
0x0916
998cd2f417 seccomp: update comment for function parse_config 
Signed-off-by: 0x0916 <w@laoqinren.net>
 2017-05-15 18:44:00 +08:00
0x0916
65afdf08b5 seccomp: s/n-new-privs/no-new-privs/g 
Signed-off-by: 0x0916 <w@laoqinren.net>
 2017-05-15 18:44:00 +08:00
Christian Brauner
179029df91 Merge pull request #1558 from 0x0916/lxc-top 
add more detail for blkio
 2017-05-15 11:06:56 +02:00
Christian Brauner
d698ad1000 Merge pull request #1562 from 0x0916/delete-unneccessory-include 
monitor: delete unnecessary include file
 2017-05-15 11:06:24 +02:00
0x0916
10174cd257 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>
 2017-05-15 15:35:43 +08:00
0x0916
7c9d733f3d add more detail for blkio 
This patch add Read and Write information for blkio bytes.

Signed-off-by: 0x0916 <w@laoqinren.net>
 2017-05-15 14:46:23 +08:00
Christian Brauner
7e0ed7ffa0 Merge pull request #1560 from dimkr/master 
conf: fix build without libcap
 2017-05-14 11:59:52 +02:00
Dima Krasner
bc5b27d6f6 conf: fix build without libcap 
Signed-off-by: Dima Krasner <samdima@securingsam.com>
 2017-05-14 12:40:02 +03:00
Stéphane Graber
1dd898cc99 Merge pull request #1553 from brauner/2017-05-12/allow_no_controlling_terminal 
lxc-attach: allow for situations without /dev/tty
 2017-05-13 16:18:30 -04:00
Serge Hallyn
66806d2432 Merge pull request #1551 from brauner/2017-05-11/fix_num_parsing 
utils: fix num parsing functions
 2017-05-13 14:46:45 -05:00
Serge Hallyn
fbe5c36ec2 Merge pull request #1556 from brauner/2017-05-13/fix_newuidmap_regression 
start: don't call lxc_map_ids() without id map
 2017-05-13 14:39:07 -05:00
Christian Brauner
57927bf255
start: don't call lxc_map_ids() without id map 
So far, we somehow always called lxc_map_ids(), even when no id map was
configured. Let's not do this.

Closes #1555.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-13 17:16:25 +02:00
Christian Brauner
6f18b9c483
lxc-attach: allow for situations without /dev/tty 
Closes #1552.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-12 16:58:09 +02:00
Christian Brauner
15fe2189e6
tests: lxc_safe_{u}int() add corner-case tests 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-12 02:26:20 +02:00
Christian Brauner
643c19840f
utils: fix num parsing functions 
Suggested-by: Benedikt Rosenkranz beluro@web.de
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-12 01:16:09 +02:00
Stéphane Graber
bd3dfa33e2 Merge pull request #1550 from brauner/2017-05-11/add_comment_to_lxc_spawn 
start: add crucial details about lxc_spawn()
 2017-05-11 11:10:19 -04:00
Christian Brauner
480588e6ad
start: add crucial details about lxc_spawn() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-11 14:41:47 +02:00
Christian Brauner
bb51d6b135 Merge pull request #1549 from 0x0916/install-systemd-unit-for-centos 
Install systemd units for CentOS
 2017-05-11 12:14:08 +02:00
0x0916
82b479119d Merge ubuntu and debiancase 
Signed-off-by: 0x0916 <w@laoqinren.net>
 2017-05-11 15:16:14 +08:00
0x0916
234f9815ff Install systemd units for CentOS 
Signed-off-by: 0x0916 <w@laoqinren.net>
 2017-05-11 15:15:18 +08:00
Stéphane Graber
394c22055f Merge pull request #1548 from brauner/2017-05-10/prevent_umount_propagation 
utils: handle > 2^31 in lxc_unstack_mountpoint()
 2017-05-10 17:04:57 -04:00
Christian Brauner
b4a40f7b45
utils: handle > 2^31 in lxc_unstack_mountpoint() 
I mean.. really? But better safe than sorry.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-10 18:28:09 +02:00
Serge Hallyn
60883ba8e1 Merge pull request #1547 from brauner/2017-05-10/prevent_umount_propagation 
start: remove umount2()
 2017-05-10 10:43:53 -05:00
Christian Brauner
39c7b795b1
conf: non-functional changes 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-10 13:35:54 +02:00
Christian Brauner
58d5b52795
start: remove umount2() 
I really fail to see the point of this and git {blame, log -S} don't really
enlighten me on the reason for this as well. But I might be dense. The way I
see it the only thing this line achieves is causing trouble when the container
is started as root because the umount2() call will umount e.g.
/usr/lib/x86_64-linux-gnu/lxc in case it is a mountpoint on the host. Note,
this is because lxc_spawn() is still called in the hosts namespaces.

Closes https://github.com/lxc/lxd/#3255.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-10 13:35:46 +02:00
Serge Hallyn
eb09dc4eb7 Merge pull request #1544 from brauner/2017-05-08/harden_console_handling 
harden console handling
 2017-05-10 00:31:03 -05:00
Christian Brauner
467c7ff315
console: fail when we cannot allocate peer tty 
There's really no reason not to if it's requested.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-10 02:52:17 +02:00
Christian Brauner
a7ba3c7ff8
conf: unstack all mounts atop /dev/console 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-09 23:29:12 +02:00
Christian Brauner
74251e49bb
utils: add lxc_unstack_mountpoint() 
lxc_unstack_mountpoint() tries to clear all mountpoints from a given path.
It return the number of successful umounts on success and -errno on error.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-09 23:27:47 +02:00
Christian Brauner
6e3bb2890c
doc: document console behavior 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-09 23:26:13 +02:00
Christian Brauner
2c056d3836
config: remove /dev/console bind mount 
The code in conf will bind-mount a /dev/pts/<n> device over a dummy regular
/dev/console file. If users really want /dev/console bind-mount from the host
they can request it explicitly in the containers config file. This change will
have no effect on current LX{C,D} behavior since we (as said above) overmount
the /dev/console bind-mount anyway.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-09 23:24:29 +02:00
Christian Brauner
2a12fefd8d
conf: lxc_setup_ttydir_console() 
In case the user specified

lxc.console = none
lxc.devttydir = bla
lxc.mount.entry = /dev/console dev/console none bind,create=file 0 0

move the mount under /dev/bla/console

If he requested a mknod()ed /dev/console rename it to /dev/bla/console.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-09 23:21:24 +02:00
Christian Brauner
8b1b121003
conf: improve lxc_setup_dev_console() 
In case the user did request a console to be set up unmount any prior
bind-mount for it.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-09 23:18:55 +02:00
Christian Brauner
3d7d929aff
conf: non-functional changes to console functions 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-09 23:17:23 +02:00
Christian Brauner
27245ff728
conf: non-functional changes lxc_setup() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-05-09 23:16:01 +02:00