Skip to content

L
lxc
Unverified Commit 940ec5dc by Josh Soref Committed by Christian Brauner
Options

spelling: otherwise

Signed-off-by: 's avatarJosh Soref <jsoref@gmail.com>
parent 44274978
Showing with 4 additions and 4 deletions
doc/ja/lxc.container.conf.sgml.in
...@@ -2272,7 +2272,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -2272,7 +2272,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
container should be run can be specified in the container container should be run can be specified in the container
configuration. The default is <command>lxc-container-default-cgns</command> configuration. The default is <command>lxc-container-default-cgns</command>
if the host kernel is cgroup namespace aware, or if the host kernel is cgroup namespace aware, or
<command>lxc-container-default</command> othewise. <command>lxc-container-default</command> otherwise.
--> -->
lxc が apparmor サポートでコンパイルされ、インストールされている場合で、ホストで apparmor が有効な場合、コンテナが従って動くべき apparmor プロファイルは、コンテナの設定で指定することが可能です。 lxc が apparmor サポートでコンパイルされ、インストールされている場合で、ホストで apparmor が有効な場合、コンテナが従って動くべき apparmor プロファイルは、コンテナの設定で指定することが可能です。
デフォルトは、ホストのカーネルで cgroup 名前空間が使える場合は <command>lxc-container-default-cgns</command>です。使えない場合は <command>lxc-container-default</command> です。 デフォルトは、ホストのカーネルで cgroup 名前空間が使える場合は <command>lxc-container-default-cgns</command>です。使えない場合は <command>lxc-container-default</command> です。
......
doc/ko/lxc.container.conf.sgml.in
...@@ -1623,7 +1623,7 @@ proc proc proc nodev,noexec,nosuid 0 0 ...@@ -1623,7 +1623,7 @@ proc proc proc nodev,noexec,nosuid 0 0
container should be run can be specified in the container container should be run can be specified in the container
configuration. The default is <command>lxc-container-default-cgns</command> configuration. The default is <command>lxc-container-default-cgns</command>
if the host kernel is cgroup namespace aware, or if the host kernel is cgroup namespace aware, or
<command>lxc-container-default</command> othewise. <command>lxc-container-default</command> otherwise.
--> -->
lxc가 apparmor를 지원하도록 컴파일된 후 설치되었고, 호스트 시스템에서 apparmor가 활성화되었다면, 컨테이너에서 따라야할 apparmor 프로파일을 컨테이너 설정에서 지정할 수 있다. 기본값은 호스트 커널이 cgroup 네임스페이스를 지원하면 <command>lxc-container-default-cgns</command>이고, 그렇지 않다면 <command>lxc-container-default</command>이다. lxc가 apparmor를 지원하도록 컴파일된 후 설치되었고, 호스트 시스템에서 apparmor가 활성화되었다면, 컨테이너에서 따라야할 apparmor 프로파일을 컨테이너 설정에서 지정할 수 있다. 기본값은 호스트 커널이 cgroup 네임스페이스를 지원하면 <command>lxc-container-default-cgns</command>이고, 그렇지 않다면 <command>lxc-container-default</command>이다.
</para> </para>
......
doc/lxc.container.conf.sgml.in
...@@ -1705,7 +1705,7 @@ dev/null proc/kcore none bind,relative 0 0 ...@@ -1705,7 +1705,7 @@ dev/null proc/kcore none bind,relative 0 0
container should be run can be specified in the container container should be run can be specified in the container
configuration. The default is <command>lxc-container-default-cgns</command> configuration. The default is <command>lxc-container-default-cgns</command>
if the host kernel is cgroup namespace aware, or if the host kernel is cgroup namespace aware, or
<command>lxc-container-default</command> othewise. <command>lxc-container-default</command> otherwise.
</para> </para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
......
src/lxc/criu.c
...@@ -951,7 +951,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_ ...@@ -951,7 +951,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
struct cgroup_ops *cgroup_ops; struct cgroup_ops *cgroup_ops;
/* Try to detach from the current controlling tty if it exists. /* Try to detach from the current controlling tty if it exists.
* Othwerise, lxc_init (via lxc_console) will attach the container's * Otherwise, lxc_init (via lxc_console) will attach the container's
* console output to the current tty, which is probably not what any * console output to the current tty, which is probably not what any
* library user wants, and if they do, they can just manually configure * library user wants, and if they do, they can just manually configure
* it :) * it :)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment