Commits · 6e54330c46bdfedaedbf4b677e557d550bdcb276 · Chen Yisong / lxc

31 Jul, 2018 4 commits

conf: introduce lxc.rootfs.managed · 6e54330c

authored Jun 27, 2018

This introduces a new config key lxc.rootfs.managed which can be used to
indicate whether this LXC instance is managing the container storage. If LXC is
not managing the storage then LXC will not modify the container storage.
For example, an API call to c->destroy(c) will then run any destroy hooks but
will not destroy the actual rootfs (Unless, of course, the hook does so behind
LXC's back.).
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
CC: Wolfgang Bumiller <w.bumiller@proxmox.com>
CC: Stéphane Graber <stgraber@ubuntu.com>
CC: Serge Hallyn <serge@hallyn.com>
CC: 2xsec <dh48.jeong@samsung.com>

6e54330c

READEM: update Serge's mail address · a3cf04da

authored Jul 31, 2018

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Serge Hallyn <serge@hallyn.com>

a3cf04da

Merge pull request #2503 from tenforward/japanese · 8da51ee9
Christian Brauner authored Jul 31, 2018
```
doc: Add incompatibility with network type=none into Japanese man
```
8da51ee9
doc: Add incompatibility with network type=none into Japanese man · e0e360c5
KATOH Yasufumi authored Jul 31, 2018
```
Update for commit e4b3e369Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
```
e0e360c5

30 Jul, 2018 7 commits
- Merge pull request #2499 from brauner/lxc/master · 542d0f26
  Stéphane Graber authored Jul 30, 2018
```
bugfixes
```
  542d0f26
- Merge pull request #2475 from brauner/2018-07-16/monitor_signal_pdeath · 01fc55d5
  Stéphane Graber authored Jul 30, 2018
```
conf: improve rootfs setup
```
  01fc55d5
- Merge pull request #2502 from brauner/2018-07-27/fix_max_devpts_option · e6b4213b
  Stéphane Graber authored Jul 30, 2018
```
conf: mount devpts without "max" on EINVAL
```
  e6b4213b
- conf: don't return a clobbered errno value · dccffc82
  Wolfgang Bumiller authored Jul 30, 2018
```
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
```
  dccffc82
- conf: mount devpts without "max" on EINVAL · dfbd4730
  Christian Brauner authored Jul 30, 2018
```
The "max" option to devpts got introduced in kernel 3.4.

Closes #2490.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
  dfbd4730
- Merge pull request #2500 from akosiaris/patch-1 · 7b52bc0b
  Christian Brauner authored Jul 30, 2018
```
Unprivileged's incompatibility with type=none docs
```
  7b52bc0b
- Unprivileged's incompatibility with type=none docs · e4b3e369
  Alexandros Kosiaris authored Jul 30, 2018
```
Unprivileged containers are not compatible with sharing the
host namespace due to an inability to mount sysfs. Add docs
in lxc.container.conf to document that out.

Refs #2463
Signed-off-by: Alexandros Kosiaris <akosiaris@gmail.com>
```
  e4b3e369
29 Jul, 2018 29 commits

caps: handle EINTR in read() · 81f87066

authored Jul 29, 2018

We don't want to link caps.{c,h} against utils.{c,h} for the sake of our static
builds init.lxc.static. This means lxc_write_nointr() will not be available. So
handle it EINTR.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

81f87066

log: handle EINTR in read() · e0c19806

authored Jul 29, 2018

We don't want to link log.{c,h} against utils.{c,h} for the sake of our static
builds init.lxc.static. This means lxc_write_nointr() will not be available. So
handle it EINTR.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

e0c19806

utils: s/read()/lxc_read_nointr()/g · a5bc6cb0
Christian Brauner authored Jul 30, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
a5bc6cb0
terminal: s/read()/lxc_read_nointr()/g · 72f7c19b
Christian Brauner authored Jul 30, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
72f7c19b
monitor: s/write()/lxc_write_nointr()/g · 802e609a
Christian Brauner authored Jul 30, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
802e609a
monitor: s/read()/lxc_read_nointr()/g · 2a71131d
Christian Brauner authored Jul 30, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
2a71131d
apparmor: s/read()/lxc_read_nointr()/g · 1fabf7d4
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
1fabf7d4
tools: s/write()/lxc_write_nointr()/g · 8367b31e
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
8367b31e
tools: s/read()/lxc_read_nointr()/g · 7b6f89cd
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
7b6f89cd
sync: s/write()/lxc_write_nointr()/g · 03876f90
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
03876f90
sync: s/read()/lxc_read_nointr()/g · ba38ff8e
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
ba38ff8e
network: s/write()/lxc_write_nointr()/g · f640cf46
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
f640cf46
network: s/read()/lxc_read_nointr()/g · c72cda4e
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
c72cda4e
lxccontainer: s/read()/lxc_read_nointr()/g · 3e1e9db8
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
3e1e9db8
lxccontainer: s/write()/lxc_write_nointr()/g · 2a2a676d
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
2a2a676d
criu: s/write()/lxc_write_nointr()/g · 614be9bc
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
614be9bc
criu: s/read()/lxc_read_nointr()/g · 668ba602
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
668ba602
cmd: s/read()/lxc_read_nointr()/g · 243fdadf
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
243fdadf
cmd: s/write()/lxc_write_nointr()/g · ff50dd77
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
ff50dd77
cmd: s/pipe()/pipe2()/g · 04dc1c00
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
04dc1c00
lxccontainer: s/pipe()/pipe2()/g · 0ac84f04
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
0ac84f04
lxccontainer: cleanup do_lxcapi_get_interfaces() · 9f4866a6
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
9f4866a6
criu: s/pipe()/pipe2()/ · de31cb57
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
de31cb57
conf: always close pipe in run_userns_fn() · adaffdd7
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
adaffdd7
conf: s/pipe()/pipe2()/g · 979f9e34
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
979f9e34
Merge pull request #2497 from brauner/2018-07-29/nl_fix · 646b1be9
Christian Brauner authored Jul 29, 2018
```
nl: avoid NULL pointer dereference
```
646b1be9

nl: avoid NULL pointer dereference · c8f05589

authored Jul 29, 2018

It's a valid case to call nla_put() with NULL data and 0 len. It's done e.g. in
the nla_put_attr().

There has to be a check for data in nla_put() as passing NULL to the memcpy()
is not allowed. Even if length is 0, both pointers have to be valid.

For a reference see C99 standard (7.21.1/2), it says: "pointer arguments on
such a call shall still have valid values".
Reported-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
[christian.brauner@ubuntu.com: adapted commit message]
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

c8f05589

confile: split mount options into flags and data · 3437f95c
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
3437f95c
conf: improve rootfs setup · 8ce1abc2
Christian Brauner authored Jul 29, 2018
```
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
```
8ce1abc2