Commit Graph

561 Commits

Author SHA1 Message Date
Christian Brauner
ba2be1a8a6
attach: move pty allocation into api
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2018-01-09 13:20:23 +01:00
KATOH Yasufumi
a0a4f759b2 doc: Add relative option for lxc.mount.entry to Japanese lxc.container.conf(5)
and:
* remove empty paragraph in English man
* untabify in Japanese man

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-12-19 20:02:46 +09:00
KATOH Yasufumi
b6feb9db85 doc: Translate the hook of network into Japanese in lxc.container.conf(5)
Update for commit 14a7b0f

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-12-19 20:02:37 +09:00
KATOH Yasufumi
efcbd1a05a doc: Add the description of new style hook to Japanese lxc.containers.conf(5)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-12-19 20:02:14 +09:00
KATOH Yasufumi
4eeecbdb08 doc: Add proc section to Japanese lxc.container.conf(5)
Update for commit 61d7a73

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-12-19 20:02:02 +09:00
KATOH Yasufumi
b45e48f097 doc: Add sysctl section to Japanese lxc.container.conf(5)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-12-19 20:01:41 +09:00
Yifeng Tan
181437fd53 conf.c: add relative option for lxc.mount.entry
Signed-off-by: Yifeng Tan <tanyifeng1@huawei.com>
2017-12-19 01:07:46 +08:00
Christian Brauner
14a7b0f98a
network: pass info in env if hook version is 1
Unblocks #2013.
Unblocks #2015.
Closes #1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-12-14 11:54:13 +01:00
Christian Brauner
18b3b9c17f
start: pass namespaces as environment variables
Unblocks #2013.
Unblocks #2015.
Closes #1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-12-14 11:52:09 +01:00
Christian Brauner
a2c09be066
start: set LXC_HOOK_VERSION
This can be used by scripts to detect what version of the hooks are used.

Unblocks #2013.
Unblocks #2015.
Closes #1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-12-14 11:47:36 +01:00
Christian Brauner
44ae0fb6ca
confile: add lxc.hook.version
Unblocks #2013.
Unblocks #2015.
Closes #1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-12-14 11:47:34 +01:00
Yifeng Tan
61d7a733c7 confile: add lxc.proc.* to set proc filesystem
Signed-off-by: Yifeng Tan <tanyifeng1@huawei.com>
2017-12-13 20:08:56 +08:00
Christian Brauner
e409b21402
conf: lxc.sysctl coding style fixes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-12-11 11:27:24 +01:00
LiFeng
7edd05402c confile: Add lxc.sysctl config
Signed-off-by: LiFeng <lifeng68@huawei.com>
2017-12-11 09:24:11 -05:00
KATOH Yasufumi
3f6b1110c9 doc: Add lxc.init.cwd to Japanese lxc.container.conf(5)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-12-05 17:23:29 +09:00
KATOH Yasufumi
615e68b2e5 doc: Add lxc.namespace.[namespace identifier] to Japanese lxc.container.conf(5)
and fix the description of namespace inheritance

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-12-05 17:08:52 +09:00
KATOH Yasufumi
4d94eb7d6b doc: Add lxc.console.buffer.* and lxc.console.rotate to Japanese lxc.container.conf(5)
and update the description of lxc.console.logfile

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-12-05 16:22:37 +09:00
LiFeng
3c4915534d confile:add lxc.init.cwd
Signed-off-by: LiFeng <lifeng68@huawei.com>
2017-12-05 04:18:07 -05:00
Christian Brauner
f3c9f12290
doc: document lxc.namespace.[namespace identifier]
Closes #1924.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-11-23 12:34:23 +01:00
Christian Brauner
d91adfa612
confile: add lxc.console.rotate
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-11-18 00:20:52 +01:00
Christian Brauner
3a784510e3
confile: add lxc.console.buffer.logfile
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-11-18 00:17:46 +01:00
Christian Brauner
28f3b1cdbe
confile: add lxc.console.buffer.size
Determines the size of the ringbuffer.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-11-18 00:17:44 +01:00
KATOH Yasufumi
fcd95ae926 doc: Update lxc.{execute,init}.cmd in lxc.container.conf(5)
* Add lxc.execute.cmd to Japanese lxc.container.conf(5)
* Tweak the description of the "INIT COMMAND" section and lxc.init.cmd
  in en and ja man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-10-06 19:40:53 +09:00
KATOH Yasufumi
1e074e8ebe doc: Add lxc.hook.start-host to Japanese lxc.container.conf(5)
Update for commit 08dd280543

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-10-06 19:23:48 +09:00
Serge Hallyn
5cda27c18f support lxc.execute.cmd container configuration option
Signed-off-by: Serge Hallyn <shallyn@cisco.com>
2017-10-02 20:40:24 +00:00
Serge Hallyn
08dd280543 add a start-host hook (v2)
This should satisfy several use cases.  The one I tested for was CNI.
I replaced the network configuration in a root owned container with:

lxc.net.0.type = empty
lxc.hook.start-host = /bin/lxc-start-netns

where /bin/lxc-start-netns contained:

=================================

echo "starting" > /tmp/debug
ip link add host1 type veth peer name peer1
ip link set host1 master lxcbr0
ip link set host1 up
ip link set peer1 netns "${LXC_PID}"
=================================

The nic 'peer1' was placed into the container as expected.

For this to work, we pass the container init's pid as LXC_PID in
an environment variable, since lxc-info cannot work at that point.

Signed-off-by: Serge Hallyn <shallyn@cisco.com>
2017-09-30 21:55:02 +00:00
KATOH Yasufumi
607a8de552 doc: Translate lxc-update-config(1) into Japanese
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-09-25 20:14:57 +09:00
Stéphane Graber
dfc8e7fe8b Merge pull request #1819 from brauner/2017-09-19/lxc-update-config_manpage
doc: add lxc-update-config manpage
2017-09-20 13:03:23 -04:00
KATOH Yasufumi
03c9e2d51b doc: fix regex-typo in Japanese and Korean lxc-monitor(1)
Update for commit e3dd06ef41

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-09-20 00:57:21 +09:00
Christian Brauner
0a29a3ef6a
doc: add lxc-update-config manpage
Closes #1818.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-19 12:51:43 +02:00
Christian Brauner
b68c6a71d4
doc: document missing env variables
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-13 05:05:36 +02:00
Christian von Roques
e3dd06ef41 fix regex-typo in lxc-monitor.sgml.in
To match names beginning with the letters "f" or "b" one can use
the regular expression "[fb].*" or "(f|b).*", but not "[f|b].*",
which would match strings beginning with "f", "|", or "b".

Signed-off-by: Christian von Roques <roques@z12.ch>
2017-09-12 18:37:06 +02:00
KATOH Yasufumi
78be8d75a5 doc: Add lxc.cgroup.dir to Japanese lxc.container.conf(5)
* and fix a typo in English man

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-09-06 19:17:00 +09:00
KATOH Yasufumi
35e2135268 doc: Translate lxc(7) into Japanese
* Update for commit 594d6e30d6
* and some improvements

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-09-06 19:03:27 +09:00
Christian Brauner
bdcbb6b377
doc: bugfixes
- lxc.id_map -> lxc.idmap
- document lxc.cgroup.dir

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-06 01:03:38 +02:00
Christian Brauner
594d6e30d6
doc: lxc.sgml.in
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-06 01:03:37 +02:00
Stéphane Graber
e6ecdcbe17
Minimal kernel version is now 3.10
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2017-09-05 16:55:55 -04:00
Long Wang
08d9d0e5bd doc: s/lxc.net.ipv6/lxc.net.ipv6.address/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 10:56:20 +08:00
Long Wang
2c67dc7987 doc: s/lxc.net.ipv4/lxc.net.ipv4.address/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 10:54:28 +08:00
Long Wang
48d5fccf10 doc: s/lxc.mount/lxc.mount.fstab/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 10:51:16 +08:00
Long Wang
e4075f8385 doc: s/lxc.pts/lxc.pty.max/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 10:47:34 +08:00
Long Wang
0873f85ce7 doc: s/lxc.tty/lxc.tty.max/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 10:45:17 +08:00
Long Wang
5042d96d12 doc: s/lxc.console/lxc.console.path/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 10:35:51 +08:00
Long Wang
a64f3157a1 doc: s/lxc.rootfs/lxc.rootfs.path/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 10:23:22 +08:00
Long Wang
501cf9b019 doc: s/seccomp/seccomp.profile/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 10:04:58 +08:00
Long Wang
b84702ab43 doc: s/se_context/selinux.context/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 09:58:35 +08:00
Long Wang
a1d5fdfd9b doc: s/aa_profile/apparmor.profile/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 09:53:58 +08:00
Long Wang
69e38e009b doc: s/aa_allow_incomplete/apparmor.allow_incomplete/g
Signed-off-by: Long Wang <w@laoqinren.net>
2017-07-12 09:46:20 +08:00
KATOH Yasufumi
35a92cd7af doc: Update Japanese lxc-ls(1)
add "--defined" option

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-07-11 17:31:20 +09:00
KATOH Yasufumi
e71b47b239 doc: Update Japanese lxc.containers.conf(5)
Follow updates of configuration keys:
* Delete lxc.kmsg (commit 26a38fb)
* lxc.console -> lxc.console.path (commit 3aed493)
* lxc.mount -> lxc.mount.fstab (commit 47148e9)
* lxc.net.ipv{4,6} -> lxc.net.ipv{4,6}.address (commit 9ff60df, 2e44ae2)
* lxc.tty -> lxc.tty.max, lxc.devttydir -> lxc.tty.dir (commit fe1c588)
* lxc.pts -> lxc.pty.max (commit 232763)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-07-11 17:22:46 +09:00