Commit Graph

709 Commits

Author SHA1 Message Date
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
Christian Brauner
0b427da0e7
confile: lxc.seccomp --> lxc.seccomp.profile
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:07 +02:00
Christian Brauner
232763d645
confile: lxc.pts --> lxc.pty.max
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:07 +02:00
Christian Brauner
fe1c588797
confile: lxc.tty --> lxc.tty.max
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:07 +02:00
Christian Brauner
2e44ae28dc
confile: lxc.net.ipv6 --> lxc.net.ipv6.address
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:06 +02:00
Christian Brauner
9ff60df25b
confile: lxc.net.ipv4 --> lxc.net.ipv4.address
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:06 +02:00
Christian Brauner
47148e96e3
confile: lxc.mount --> lxc.mount.fstab
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:06 +02:00
Christian Brauner
3aed493406
confile: lxc.console --> lxc.console.path
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:06 +02:00
Christian Brauner
7a96a068f8
confile: lxc.rootfs --> lxc.rootfs.path
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:06 +02:00
Christian Brauner
3e01c200b1
doc: remove lxc.rootfs.backend
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-07-02 14:40:06 +02:00
Christian Brauner
c6f7b9513a Merge pull request #1591 from grzgrzgrz3/regres-lxc-ls
lxc-ls: return all containers by default, new filter - list only defi…
2017-07-02 14:31:03 +02:00
0x0916
b67771bc26 confile: rename lxc.utsname to lxc.uts.name
the legacy keys will be kept around until LXC 3.0 and then will be
removed.

Signed-off-by: 0x0916 <w@laoqinren.net>
2017-06-30 09:43:53 +08:00
0x0916
55c84efcba confile: namespace lxc.signal keys
* rename lxc.haltsignal to lxc.signal.halt
* rename lxc.rebootsignal to lxc.signal.reboot
* rename lxc.stopsignal to lxc.signal.stop

the legacy keys will be kept around until LXC 3.0 and then will be
removed.

Signed-off-by: 0x0916 <w@laoqinren.net>
2017-06-30 09:41:25 +08:00
0x0916
46cc906dc0 confile: namespace lxc.log keys
* rename lxc.logfile to lxc.log.file
* renaem lxc.loglevel to lxc.log.level
* rename lxc.syslog to lxc.log.syslog

the legacy keys will be kept around until LXC 3.0 and then will be
removed.

Signed-off-by: 0x0916 <w@laoqinren.net>
2017-06-30 09:41:04 +08:00
0x0916
9dcf7b4d23 confile: namespace lxc.init keys
* rename lxc.init_cmd to lxc.init.cmd
* rename lxc.init_uid to lxc.init.uid
* rename lxc.init_gid to lxc.init.gid

the legacy keys will be kept around until LXC 3.0 and then will be
removed.

Signed-off-by: 0x0916 <w@laoqinren.net>
2017-06-29 22:14:46 +08:00
0x0916
240d4b74ce confile: rename lxc.limit to lxc.prlimit
Signed-off-by: 0x0916 <w@laoqinren.net>
2017-06-29 22:14:34 +08:00
0x0916
7fa3f2e9eb replace all lxc.network* with lxc.net*
This patch wipe all references to lxc.network{[i]}.*
and replace with lxc.net.{[i]}.* in templates, documentation
and configuration files.

Signed-off-by: 0x0916 <w@laoqinren.net>
2017-06-29 13:18:41 +08:00
Christian Brauner
26a38fb6aa
confile: remove lxc.kmsg
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-06-23 16:00:23 +02:00
KATOH Yasufumi
50a8555e99 doc: Untabify Japanese lxc.container.conf(5)
Tab and white space is mixed in Japanese lxc.container.conf(5), so
unify into the white space.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-06-20 17:36:30 +09:00
KATOH Yasufumi
2513f519cb doc: Tweak Japanese lxc.container.conf(5)
Add description of new network configuration, and tweak.

Update for commit b9986e437b

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-06-20 17:28:49 +09:00
Christian Brauner
b9986e437b
doc: tweak lxc.container.conf a little
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-06-05 19:17:10 +02:00
Grzegorz Grzywacz
c2e1b07ab7 lxc-ls: return all containers by default, new filter - list only defined containers.
1.x.x lxc-ls list all containers, new lxc-ls (2.x.x) implementation is
ignoring not defined containers.

related with issue: #984

Signed-off-by: Grzegorz Grzywacz <grzgrzgrz3@gmail.com>
2017-05-27 19:43:41 +02:00
KATOH Yasufumi
7a534f673c doc: Add console behavior to Japanese lxc.container.conf(5)
Update for commit 6e3bb2890c

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-05-23 15:48:34 +09: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
KATOH Yasufumi
e7267b539e doc: add lxc.limit to lxc.container.conf(5)
Update for commit 93f9e90

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-04-25 17:33:36 +09:00
Wolfgang Bumiller
93f9e90d72 doc: add lxc.limit to lxc.container.conf
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
2017-04-11 14:01:11 +02:00
Evgeni Golov
8b66257910 improve wording of the help page for lxc-ls
it's "list of columns", not "list of column"

Signed-off-by: Evgeni Golov <evgeni@debian.org>
2016-10-30 14:20:15 +01:00
Sungbae Yoo
15f919b9cc doc: Add lxc.no_new_privs to Korean lxc.container.conf(5)
Update for commit 222ddc

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-09-20 18:10:33 +09:00
KATOH Yasufumi
16e58f07bd doc: Add lxc.no_new_privs to Japanese lxc.container.conf(5)
Update for commit 222ddc

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-09-16 15:56:45 +09:00
Christian Brauner
222ddc91a8
doc: add lxc.no_new_privs to lxc.container.conf
Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
2016-09-05 22:56:24 +02:00
Evgeni Golov
fef509cbc5 set FULL_PATH_NAMES=NO in doc/api/Doxyfile
otherwise the generated docs have the full build path in them
and nonbody cares that the files were built in
 /build/lxc-_BVY2u/lxc-2.0.4/src/lxc/

Signed-off-by: Evgeni Golov <evgeni@debian.org>
2016-08-27 12:14:59 +02:00
Sungbae Yoo
6b9c2f40fd doc: Add --rcfile to Japanese common opts
Update for commit 71d74a8

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-08-18 17:51:34 +09:00
Sungbae Yoo
14acde79bb doc: Add --rcfile to Korean common opts
Update for commit 71d74a8

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-08-18 16:50:15 +09:00
Sungbae Yoo
ef747fd885 doc: Update Korean lxc-attach(1)
* Update for commit 03b0398
 * Fix mistranslation words

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-08-18 16:41:37 +09:00
Wolfgang Bumiller
71d74a8342 doc: add --rcfile to common opts
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
2016-08-17 16:27:23 +02:00
KATOH Yasufumi
c91e90b5bd doc: Update Japanese lxc-attach(1)
* Add undocumented options (-v/--set-var, --keep-var, -f/--rcfile)
* Change order of option in SYNOPSIS (-L that is placed after "command")
* Add long options in SYNOPSIS

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-08-12 17:29:55 +09:00
KATOH Yasufumi
03b03982dd doc: Update lxc-attach(1)
* Add undocumented options (-v/--set-var, --keep-var, -f/--rcfile)
* Change order of option in SYNOPSIS (-L that is placed after "command")
* Add long options in SYNOPSIS

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-08-12 17:26:31 +09:00
Sungbae Yoo
df07390b0e doc: Add documentation of lxc.syslog to Korean lxc.container.conf(5)
Update for commit 204dfdf

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-08-02 11:44:12 +09:00
KATOH Yasufumi
917420ddcb doc: Add documentation of lxc.syslog to Japanese lxc.container.conf(5)
and add local6 to valid facility

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-08-01 20:46:16 +09:00
Baptiste Daroussin
204dfdf28b Add documentation for the new syslog logging mechanism
Signed-off-by: Baptiste Daroussin <bapt@gandi.net>
2016-07-29 23:31:48 +02:00
Sungbae Yoo
a84c8ed150 doc: Update Korean lxc-copy(1) to include tmpfs option
Update for commit a361e56

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-07-20 18:00:26 +09:00
KATOH Yasufumi
53a92bbcb6 doc: Update Japanese lxc-copy(1) to include tmpfs option
Update for commit a361e56

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-07-20 16:03:34 +09:00
Christian Brauner
a361e56278
lxc-copy: update manpage to include tmpfs option
Signed-off-by: Christian Brauner <cbrauner@suse.de>
2016-07-19 00:04:10 +02:00
Stéphane Graber
3f3fd9e2ba Fix typo found by lintian
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-06-29 16:56:41 -04:00
Sungbae Yoo
f7fe38741d doc: Add logging option to Korean lxc-attach(1)
Update for commit f43d63b

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-05-02 18:25:29 +09:00
KATOH Yasufumi
8359be8c82 doc: Add logging option to Japanese lxc-attach(1)
Update for commit f43d63b

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-04-25 19:30:03 +09:00
Christian Brauner
f43d63bc66 lxc-attach: add logging option to manpage
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-04-11 18:14:16 +02:00
KATOH Yasufumi
933acbed73 doc: Add lxc.rootfs.backend in Japanese lxc.container.conf(5)
Update for commit f903986

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-04-05 11:04:59 +09:00
Sungbae Yoo
780821f8f6 Add a document of lxc.rootfs.backend in Korean manpage
Update for commit f903986

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-04-04 11:26:19 +09:00
Evgeni Golov
e9555a6bc7 fix spelling mistakes spotted by Debian's lintian
Signed-off-by: Evgeni Golov <evgeni@debian.org>
2016-04-03 18:50:16 +02:00
Serge Hallyn
f9039861c0 document lxc.rootfs.backend
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2016-04-02 22:05:09 -05:00
Sungbae Yoo
b922759db9 doc: improve lxc-unshare(1)
Explain that the pipe symbol needs to be escaped for -s.

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-03-04 12:01:15 +09:00
Sungbae Yoo
aef119a3fa doc: improve Korean lxc-attach(1)
Explain that the pipe symbol needs to be escaped for -e and -s.
Update for commit 759d521

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-03-04 11:55:03 +09:00
Sungbae Yoo
273b3837ce doc: add copy hook explanation to Korean lxc-copy(1)
Update for commit cc0607a

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-03-04 11:28:27 +09:00
KATOH Yasufumi
352470062e doc: improve Japanese lxc-attach(1)
Explain that the pipe symbol needs to be escaped for -e and -s.
Update for commit 759d521

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-03-03 16:25:09 +09:00
KATOH Yasufumi
79dff39e89 doc: add copy hook explanation to Japanese lxc-copy(1)
Update for commit cc0607a

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-03-03 16:13:35 +09:00
Christian Brauner
cc0607a931 lxc-copy: add copy hook explanation to manpage
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-03-02 14:09:56 +01:00
Christian Brauner
759d521b1f lxc-attach: small improvements to manpage
Explain that the pipe symbol needs to be escaped for -e and -s.

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-03-02 12:48:38 +01:00
Christian Brauner
c46954935b Merge pull request #854 from ysbnim/master
Update Korean manuals
2016-02-26 12:48:23 +01:00
KATOH Yasufumi
f025e64819 doc: Update Japanese lxc-attach(1)
Update the description of pty allocation. Update for commit 478dda7.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-02-26 20:05:09 +09:00
Sungbae Yoo
bcd7520a48 doc: Add the Korean description that automount is ignored when cgroup namespaces are supported.
Update for commit 4608594

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-02-26 20:02:38 +09:00
Sungbae Yoo
77fbb4d2d9 doc: Update Korean lxc-clone(1) and lxc-start-ephemeral(1)
Update for commit 2ae6732.

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-02-26 20:02:38 +09:00
Sungbae Yoo
eae7ec6edc doc: Update Korean lxc-attach(1)
Update for commit e986ea3

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-02-26 20:02:33 +09:00
Sungbae Yoo
1e4fe6112c doc: Add the Korean description of cgns apparmor profile in lxc.container.conf
Update for commit 7a126ae

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-02-26 20:01:29 +09:00
Sungbae Yoo
a3e596c3a5 doc: Add LXC_CGNS_AWARE env to Korean lxc.container.conf(5)
Update for commit c4cafa0

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-02-26 19:58:56 +09:00
Christian Brauner
478dda766a lxc-attach: rework pty allocation
Previously we implemented two ways to get a pty for lxc-attach:
	1. get a pty in the container
	2. get a pty on the host

Where 1. was the default and 2. was only tried after 1. failed.
For safety and simplicity reasons, we remove 1. and just keep 2. around.

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-02-25 19:27:02 +01:00
KATOH Yasufumi
cd548c9d86 doc: Update Japanese lxc.container.conf(5)
- Add the description that automount is ignored when cgroup namespaces
  are supported. Update for commit 4608594.
- Unify terminology of translation

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-02-25 15:44:44 +09:00
KATOH Yasufumi
bf5afa6e6b doc: Update Japanese lxc-clone(1) and lxc-start-ephemeral(1)
describe that lxc-clone and lxc-start-ephemeral have been deprecated
in those man pages.
Update for commit 2ae6732.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-02-25 15:15:41 +09:00
Stéphane Graber
e80ca772ad Merge pull request #846 from hallyn/2016-02-24/cgns.auto
cgfs: do not automount if cgroup namespaces are supported
2016-02-24 21:11:29 -05:00
Serge Hallyn
4608594e1d cgfs: do not automount if cgroup namespaces are supported
In that case containers will be able to mount cgroup filesystems
for themselves as they do on a host.

This fixes inability to start systemd based containers on cgns-enabled
kernels with cgmanager not running.

I've tested debian jessie, busybox, ubuntu trusty and xenial, all of
which booted ok.  However if there are some setups which require
premounted cgroupfs (i.e. they don't mount if they detect being in
a container), this may cause trouble.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2016-02-24 17:47:23 -08:00
Christian Brauner
d0a6bd3940 configure.ac: add --enable-deprecated flag
- lxc-clone and lxc-start-ephemeral are marked deprecated. We add a
  --enable-deprecated flag to configure.ac allowing us to enable these
  deprecated executables
- update tests to use lxc-copy instead of lxc-clone

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-02-24 21:07:26 +01:00
Christian Brauner
2ae6732f6b mark lxc-clone & lxc-start-ephemeral as deprecated
- add deprecation not to man pages
- print deprecation info to stderr when the executables are invoked

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-02-24 21:07:26 +01:00
KATOH Yasufumi
23a3ea07e8 doc: Update Japanese lxc-clone(1) and lxc-start-ephemeral(1)
Update for commit 02e5d92

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-02-24 18:04:40 +09:00
KATOH Yasufumi
b6acc629c0 doc: Update Japanese lxc-attach(1)
Update for commit e986ea3

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-02-24 18:04:05 +09:00
Christian Brauner
02e5d92b70 update manpages
- add note to lxc-clone manpage that it is superseded by lxc-copy
- add note to lxc-start-ephemeral manpage that it is superseded by lxc-copy
- fix typo in lxc-attach manpage
- fix some of my comments in lxc_ls.c

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-02-23 10:26:31 +01:00
Christian Brauner
e986ea3dfa update lxc-attach manpage
- explain rationale behind allocation of pty
- briefly explain how a pty is allocated
- add a short note that describes the changed behavior for lxc-attach when the
  user is not placed in a writeable cgroup at login

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2016-02-22 23:23:58 +01:00
KATOH Yasufumi
9d101b3d8b doc: Add Japanese description of cgns apparmor profile in lxc.container.conf(5)
Update for commit 7a126ae

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2016-02-22 15:21:40 +09:00
Serge Hallyn
7a126ae1f2 lxc.container.conf / apparmor : document cgns profile
Also document 'unchanged' which we had never documented before.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2016-02-21 20:46:58 -08:00
KATOH Yasufumi
63f2635db0 doc: add LXC_CGNS_AWARE env to Japanese lxc.container.conf(5)
Update for commit c4cafa0

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-21 00:55:02 -05:00
Stéphane Graber
0fe2983a45
Fix typo in lxc manpage
Reported-by: lintian
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-19 23:37:07 -05:00
Stéphane Graber
129881b9d5
Fix doc build warnings
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-16 01:16:33 -05:00
Stéphane Graber
94891ea3e4 Remove legacy versions of lxc-ls
lxc-ls nowadays is a C binary so there's no need to keep the python and
shell versions around anymore, remove them from the branch and cleanup
documentation and Makefiles.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-02 12:16:52 +01:00
Sungbae Yoo
83a6b14280 doc: update overlayfs and aufs in Japanese lxc.container.conf(5)
add the description of multiple lower layer.
Update for commit 280d237

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-02-01 20:52:41 +09:00
Sungbae Yoo
c988c6f689 doc: Add network clear option to Korean lxc.container.conf(5)
Update for commit 020104c

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-02-01 20:52:31 +09:00
Sungbae Yoo
8dd2c382e1 doc: add clear behaviour of list options to Korean lxc.container.conf(5)
Update for commit ff68914

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2016-02-01 20:52:22 +09:00
Stéphane Graber
da1f8f26b5
Also move lxc-device in translated docs
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-01 11:28:28 +01:00
Wolfgang Bumiller
03f09a8ada doc: always enable lxc-device.1
Commit ea4679694 replaced the python implementation with a
C one.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-01 11:27:01 +01:00
KATOH Yasufumi
ddf81220fa doc: update overlayfs and aufs in Japanese lxc.container.conf(5)
add the description of multiple lower layer.
Update for commit 280d237

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-01 09:44:17 +01:00
KATOH Yasufumi
2a839fde90 doc: Adapt manpage for Japanese lxc-ls to new C implementation
Update for commit 37cf83e

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-01 09:44:17 +01:00
KATOH Yasufumi
3f45936bd3 doc: Add network clear option to Japanese lxc.container.conf(5)
Update for commit 020104c

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-01 09:44:17 +01:00
KATOH Yasufumi
eda15f2565 doc: add clear behaviour of list options to Japanese lxc.container.conf(5)
Update for commit ff68914

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-02-01 09:44:17 +01:00
Stéphane Graber
27a72f2faa
Fix syntax error in ko/lxc-ls.sgml.in
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-31 12:15:59 +01:00
Sungbae Yoo
3fce3181e2 doc: Adapt manpage for Korean lxc-ls to new C implementation
Update for commit 37cf83e

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-31 11:39:01 +01:00
Sungbae Yoo
57e1ac96fb doc: Add valueless lxc.cap.drop behaviour to Korean man page
Update for commit 7eff30f

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-31 11:38:59 +01:00
Sungbae Yoo
23faab5d6b doc: Add lxc-copy to Korean/Japanese see_also.sgml.in
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-31 11:38:57 +01:00
Min Wang
c35d29097c increase /dev size to 500k ( issue #781)
Signed-off-by: Min Wang <mingewang@gmail.com>
2016-01-29 16:27:35 -05:00
Christian Brauner
280d23796c update overlayfs and aufs in lxc.container.conf
Explain that multiple /lower layers can be used.

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2016-01-28 12:02:23 +01:00
Christian Brauner
37cf83ea15 Adapt manpage for lxc-ls to new C implementation
- explain new numeric argument to --nesting
- include common options as lxc-ls now uses the standard lxc parser
- add history section and update authors

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2016-01-28 12:01:18 +01:00
Christian Brauner
7cfe3dd71f add lxc-copy to see_also.sgml.in
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2016-01-28 11:58:57 +01:00
Marko Hauptvogel
020104c3ad Document network clear option
Should be mentioned separately because it will reset a big group of options.

Signed-off-by: Marko Hauptvogel <marko.hauptvogel@googlemail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-28 11:58:21 +01:00
Marko Hauptvogel
ff68914914 Document clear behaviour of list options
More general for all list options.

Seems to currently affect:
lxc.network (clear all NICs)
lxc.network.* (clear current NIC)
lxc.cap.drop
lxc.cap.keep
lxc.cgroup
lxc.mount.entry
lxc.mount.auto
lxc.hook
lxc.id_map
lxc.group
lxc.environment

Signed-off-by: Marko Hauptvogel <marko.hauptvogel@googlemail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-28 11:58:16 +01:00
KATOH Yasufumi
9c3f2966dd doc: Add valueless lxc.cap.drop behaviour to Japanese man page
Update for commit 7eff30f

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-28 11:58:14 +01:00
Sungbae Yoo
1cddc3a414 doc: Add LXC_SRC_NAME to Korean lxc.container.conf(5)
Update for commit 0794541

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-28 11:58:10 +01:00
Serge Hallyn
c4cafa080c add LXC_CGNS_AWARE env variable for mount hooks
This way the lxcfs mount hook can know whether lxc knows about
cgroup namespaces.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2016-01-08 13:03:37 -08:00
KATOH Yasufumi
1bc07a5b8d doc: Improve man pages
* Add long options if not be written
* Remove optional tags in OPTIONS section

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-04 12:55:21 -05:00
KATOH Yasufumi
0794541858 doc: Add LXC_SRC_NAME to lxc.container.conf(5)
only add to English and Japanese docs.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-04 12:55:19 -05:00
Marko Hauptvogel
7eff30fd5d Documenting valueless lxc.cap.drop behaviour
From b24b0e16848fbb93402a08efa3950cd59272b8da Mon Sep 17 00:00:00 2001
From: Marko Hauptvogel <marko.hauptvogel@googlemail.com>
Date: Sun, 3 Jan 2016 23:07:19 +0100
Subject: [PATCH] Documenting valueless lxc.cap.drop behaviour

Undocummented behaviour since 7d0eb87.

Signed-off-by: Marko Hauptvogel <marko.hauptvogel@googlemail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2016-01-04 12:52:06 -05:00
KATOH Yasufumi
85f287b703 doc: Add 'rbd' to the parameter of backingstore in Japanese lxc-create(1)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-20 22:42:28 -05:00
Sungbae Yoo
9bc7ae484b doc: Add 'rbd' to the parameter of backingstore in Korean lxc-create(1)
Update for commit 60656b3

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-20 22:42:28 -05:00
Sungbae Yoo
d1f81425d2 doc: Add lxc.monitor.unshare to Korean lxc.container.conf(5)
Update for commit a8dfe4e and 6039eaa

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-20 22:42:28 -05:00
Laurent Barbe
60656b379b doc: Add 'rbd' to the parameter of backingstore in lxc-create(1)
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2015-12-13 22:35:43 +01:00
Stéphane Graber
33ae222cf9 Merge pull request #710 from hnakamur/improve_lxc_copy_japanese_manpage
Improve the lxc-copy Japanese manpage
2015-12-09 23:03:31 -05:00
Sungbae Yoo
ba3004da53 Add LXC_TARGET env to Korean lxc.container.conf(5)
Update for commit c154af9

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-09 22:59:08 -05:00
Hiroaki Nakamura
988247d5ad Improve the lxc-copy Japanese manpage
Signed-off-by: Hiroaki Nakamura <hnakamur@gmail.com>
2015-12-05 01:08:22 +09:00
KATOH Yasufumi
86b484e979 doc: Add lxc.monitor.unshare to lxc.container.conf(5)
Update for commit a8dfe4e and 6039eaa

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 13:53:38 -05:00
KATOH Yasufumi
3c08e89391 Add LXC_TARGET env to Japanese lxc.container.conf(5)
Update for commit c154af9

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 13:53:36 -05:00
KATOH Yasufumi
842948e416 doc: Add Japanese manpage for lxc-copy
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 13:53:34 -05:00
Sungbae Yoo
b035f79209 doc: Add Korean manpage for lxc-copy
Update for commit 2b47bac

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-12-03 01:14:34 -05:00
Wolfgang Bumiller
6039eaa236 doc: lxc.monitor.unshare requires CAP_SYS_ADMIN
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 01:14:11 -05:00
Wolfgang Bumiller
a8dfe4e08d Added lxc.monitor.unshare
If manual mounting with elevated permissions is required
this can currently only be done in pre-start hooks or before
starting LXC. In both cases the mounts would appear in the
host's namespace.
With this flag the namespace is unshared before the startup
sequence, so that mounts performed in the pre-start hook
don't show up on the host.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 01:14:08 -05:00
Stéphane Graber
c154af98c1 Export LXC_TARGET env variable in stop hook
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-12-03 01:10:30 -05:00
Christian Brauner
2b47bac3f8 Add manpage for lxc-copy
(A trivial fix for lxc-copy is included.)

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
2015-11-17 11:32:53 -05:00
Sungbae Yoo
4ff8fb6cae Unify the polite word style in Korean manpages
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-11-06 13:28:22 -05:00
Sungbae Yoo
756f0ae856 doc: Add the description of lxc.hook.stop to Korean lxc.container.conf(5)
Update for commit 0a2b5ab

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-11-06 13:28:22 -05:00
KATOH Yasufumi
d0b2a43477 doc: Add the description of lxc.hook.stop to Japanese lxc.container.conf(5)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-10-29 17:45:49 -04:00
Sungbae Yoo
06ce392132 doc: Add lxc.ephemeral in Korean lxc.container.conf(5)
Update for commit 4e6eb26

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-10-29 17:45:47 -04:00
Sungbae Yoo
73740a136b doc: Add the note related mount in Korean lxc.container.conf(5)
Update for commit 592fd47

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-10-07 16:39:46 +01:00
Sungbae Yoo
5901bc7919 doc: Add the common and '-s' option in Korean lxc-destroy(1)
Update for commit 3635c5e

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-10-07 16:39:44 +01:00
KATOH Yasufumi
7346eb3aab doc: Add lxc.ephemeral in Japanese lxc.container.conf(5)
Update for commit 4e6eb26

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-10-07 16:39:42 +01:00
Wolfgang Bumiller
0a2b5ab1e7 document the stop hook
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-10-07 16:38:12 +01:00
KATOH Yasufumi
2c79e91b4b doc: Add the note related mount in Japanese lxc.container.conf(5)
Update for commit 592fd47

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-10-05 11:49:25 +01:00
Christian Brauner
4e6eb26bf0 Add lxc.ephemeral to lxc.container.conf manpage
Signed-off-by: Christian Brauner <christianvanbrauner@gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-10-05 11:47:16 +01:00
Serge Hallyn
592fd47a62 CVE-2015-1335: Protect container mounts against symlinks
When a container starts up, lxc sets up the container's inital fstree
by doing a bunch of mounting, guided by the container configuration
file.  The container config is owned by the admin or user on the host,
so we do not try to guard against bad entries.  However, since the
mount target is in the container, it's possible that the container admin
could divert the mount with symbolic links.  This could bypass proper
container startup (i.e. confinement of a root-owned container by the
restrictive apparmor policy, by diverting the required write to
/proc/self/attr/current), or bypass the (path-based) apparmor policy
by diverting, say, /proc to /mnt in the container.

To prevent this,

1. do not allow mounts to paths containing symbolic links

2. do not allow bind mounts from relative paths containing symbolic
links.

Details:

Define safe_mount which ensures that the container has not inserted any
symbolic links into any mount targets for mounts to be done during
container setup.

The host's mount path may contain symbolic links.  As it is under the
control of the administrator, that's ok.  So safe_mount begins the check
for symbolic links after the rootfs->mount, by opening that directory.

It opens each directory along the path using openat() relative to the
parent directory using O_NOFOLLOW.  When the target is reached, it
mounts onto /proc/self/fd/<targetfd>.

Use safe_mount() in mount_entry(), when mounting container proc,
and when needed.  In particular, safe_mount() need not be used in
any case where:

1. the mount is done in the container's namespace
2. the mount is for the container's rootfs
3. the mount is relative to a tmpfs or proc/sysfs which we have
   just safe_mount()ed ourselves

Since we were using proc/net as a temporary placeholder for /proc/sys/net
during container startup, and proc/net is a symbolic link, use proc/tty
instead.

Update the lxc.container.conf manpage with details about the new
restrictions.

Finally, add a testcase to test some symbolic link possibilities.

Reported-by: Roman Fiedler
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-29 09:52:55 -04:00
Sungbae Yoo
76072aec5c doc: Update Korean lxc-snapshot(1) for newname option
Update for commit dedd4f6

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:32:07 -04:00
Sungbae Yoo
5033e12328 doc: Add lxc.init_(uid|gid) in Korean lxc.container.conf(5)
update for commit dbca923

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:31:43 -04:00
Sungbae Yoo
3703aa9e73 doc: Update Korean lxc.cgroup.use in lxc.system.conf(5)
Update for commit 2d8632d

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:31:22 -04:00
Sungbae Yoo
0a05624e82 doc: Add the rename option to lxc-clone(1) in Korean manual
Update for commit 585f3c6

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:30:45 -04:00
Sungbae Yoo
b7349f15f7 doc: Add LXC-specific mount option in Korean lxc.container.conf(5)
Update for commit f5b67b3

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:30:14 -04:00
KATOH Yasufumi
7c3d395052 doc: Update Japanese lxc-snapshot(1) for newname option
Update for commit dedd4f6

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:29:49 -04:00
KATOH Yasufumi
7ee64c0f21 doc: Add lxc.init_(uid|gid) in Japanese lxc.container.conf(5)
update for commit dbca923

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:29:25 -04:00
KATOH Yasufumi
3635c5eee8 doc: Add the common and '-s' option in lxc-destroy(1)
* Add the description of '-s' option
* Remove '-P' option, and add common options
* Improve Japanese translation

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:28:49 -04:00
KATOH Yasufumi
b332333b43 doc: Add LXC-specific mount option in Japanese lxc.container.conf(5)
Add the description of optional, create=file/dir for lxc.mount.entry.
This is update for commit f5b67b3.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-09-21 11:27:06 -04:00
Christian Brauner
dedd4f6771 Adapt manpage for lxc-snapshot
Signed-off-by: Christian Brauner <christianvanbrauner@gmail.com>
2015-08-28 18:57:49 +02:00
Stéphane Graber
c804bedf8b Merge pull request #585 from ptoomey3/lxc-execute-as-user
Add support for specified UID/GID for lxc-execute in a private user namespace
2015-08-28 11:23:13 -04:00
Patrick Toomey
dbca9237db Update english docs for new lxc.init_uid and lxc.init_gid options
Signed-off-by: Patrick Toomey <ptoomey3@biasedcoin.com>
2015-08-28 08:25:23 -06:00
Stéphane Graber
0ab45a162e Merge pull request #617 from alkino/master
A little bit of refactor and doc
2015-08-27 16:58:06 -04:00
Stéphane Graber
d4b36defec Merge pull request #631 from alkino/doc
Add long option for -P in documentation
2015-08-27 16:34:00 -04:00
KATOH Yasufumi
2d8632d5b7 doc: Update lxc.cgroup.use in lxc.system.conf(5)
LXC now uses lxc.cgroup.use even when cgmanager is used.
So remove the description for the case of using cgmanager.
And add the case of not specifying it.
This commit only updates en and ja man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-08-27 16:10:36 -04:00
Nicolas Cornu
f5b67b36e2 Add doc for optional, create=dir and create=file in lxc.container.conf man
Signed-off-by: Nicolas Cornu <ncornu@aldebaran.com>
2015-08-14 17:59:09 +02:00
Nicolas Cornu
3519a99c82 Add long option for -P in documentation
Signed-off-by: Nicolas Cornu <ncornu@aldebaran.com>
2015-08-14 17:57:53 +02:00
KATOH Yasufumi
585f3c6b69 doc: Add the rename option to lxc-clone(1)
Update Japanese and English man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-08-13 16:30:41 -04:00
Sungbae Yoo
2aeb28ec17 doc: Add the description for --version to Korean common_options
Update for commit 7cab33b

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2015-08-04 18:16:14 +09:00
Sungbae Yoo
347597fa53 doc: Add the description for -P and --version to Korean lxc-ls(1)
Update for commit 2cf7c05

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2015-08-04 18:15:18 +09:00