Merge pull request #1120 from tenforward/update_man

Update English and Japanese lxc-attach(1)
This commit is contained in:
Christian Brauner 2016-08-12 10:35:43 +02:00 committed by GitHub
commit 6fe1146ddb
2 changed files with 118 additions and 12 deletions

View File

@ -55,15 +55,18 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<refsynopsisdiv>
<cmdsynopsis>
<command>lxc-attach</command>
<arg choice="req">-n <replaceable>name</replaceable></arg>
<arg choice="opt">-a <replaceable>arch</replaceable></arg>
<arg choice="opt">-e</arg>
<arg choice="opt">-s <replaceable>namespaces</replaceable></arg>
<arg choice="opt">-R</arg>
<arg choice="req">-n, --name <replaceable>name</replaceable></arg>
<arg choice="opt">-f, --rcfile <replaceable>config_file</replaceable></arg>
<arg choice="opt">-a, --arch <replaceable>arch</replaceable></arg>
<arg choice="opt">-e, --elevated-privileges <replaceable>privileges</replaceable></arg>
<arg choice="opt">-s, --namespaces <replaceable>namespaces</replaceable></arg>
<arg choice="opt">-R, --remount-sys-proc</arg>
<arg choice="opt">--keep-env</arg>
<arg choice="opt">--clear-env</arg>
<arg choice="opt">-L, --pty-log <replaceable>file</replaceable></arg>
<arg choice="opt">-v, --set-var <replaceable>variable</replaceable></arg>
<arg choice="opt">--keep-var <replaceable>variable</replaceable></arg>
<arg choice="opt">-- <replaceable>command</replaceable></arg>
<arg choice="opt">-L <replaceable>file</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@ -121,6 +124,29 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<variablelist>
<varlistentry>
<term>
<option>-f, --rcfile <replaceable>config_file</replaceable></option>
</term>
<listitem>
<para>
<!--
Specify the configuration file to configure the virtualization
and isolation functionalities for the container.
-->
コンテナの仮想化、隔離機能の設定のための設定ファイルを指定します。
</para>
<para>
<!--
This configuration file if present will be used even if there is
already a configuration file present in the previously created
container (via lxc-create).
-->
(lxc-create 経由で) 前もってコンテナが作られた際の設定ファイルが既にあった場合でも、このオプションが指定された場合は、指定した設定ファイルが使用されます。
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-a, --arch <replaceable>arch</replaceable></option>
@ -334,6 +360,39 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-v, --set-var <replaceable>variable</replaceable></option>
</term>
<listitem>
<para>
<!--
Set an additional environment variable that is seen by the
attached program in the container. It is specified in the
form of "VAR=VALUE", and can be specified multiple times.
-->
コンテナにアタッチしたプログラムから見える環境変数を追加します。このオプションは "VAR=VALUE" の形式で指定し、複数回指定できます。
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>--keep-var <replaceable>variable</replaceable></option>
</term>
<listitem>
<para>
<!--
Keep a specified environment variable. It can only be
specified in conjunction
with <replaceable>\-\-clear-env</replaceable>, and can be
specified multiple times.
-->
<replaceable>--clear-env</replaceable> を指定した際に、クリアせずに保持したままにしたい環境変数を指定します。<replaceable>--clear-env</replaceable> と同時にしか使えません。複数回指定できます。
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>

View File

@ -50,15 +50,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<refsynopsisdiv>
<cmdsynopsis>
<command>lxc-attach</command>
<arg choice="req">-n <replaceable>name</replaceable></arg>
<arg choice="opt">-a <replaceable>arch</replaceable></arg>
<arg choice="opt">-e</arg>
<arg choice="opt">-s <replaceable>namespaces</replaceable></arg>
<arg choice="opt">-R</arg>
<arg choice="req">-n, --name <replaceable>name</replaceable></arg>
<arg choice="opt">-f, --rcfile <replaceable>config_file</replaceable></arg>
<arg choice="opt">-a, --arch <replaceable>arch</replaceable></arg>
<arg choice="opt">-e, --elevated-privileges <replaceable>privileges</replaceable></arg>
<arg choice="opt">-s, --namespaces <replaceable>namespaces</replaceable></arg>
<arg choice="opt">-R, --remount-sys-proc</arg>
<arg choice="opt">--keep-env</arg>
<arg choice="opt">--clear-env</arg>
<arg choice="opt">-L, --pty-log <replaceable>file</replaceable></arg>
<arg choice="opt">-v, --set-var <replaceable>variable</replaceable></arg>
<arg choice="opt">--keep-var <replaceable>variable</replaceable></arg>
<arg choice="opt">-- <replaceable>command</replaceable></arg>
<arg choice="opt">-L <replaceable>file</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@ -102,6 +105,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<variablelist>
<varlistentry>
<term>
<option>-f, --rcfile <replaceable>config_file</replaceable></option>
</term>
<listitem>
<para>
Specify the configuration file to configure the virtualization
and isolation functionalities for the container.
</para>
<para>
This configuration file if present will be used even if there is
already a configuration file present in the previously created
container (via lxc-create).
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-a, --arch <replaceable>arch</replaceable></option>
@ -252,6 +272,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>-v, --set-var <replaceable>variable</replaceable></option>
</term>
<listitem>
<para>
Set an additional environment variable that is seen by the
attached program in the container. It is specified in the
form of "VAR=VALUE", and can be specified multiple times.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<option>--keep-var <replaceable>variable</replaceable></option>
</term>
<listitem>
<para>
Keep a specified environment variable. It can only be
specified in conjunction
with <replaceable>--clear-env</replaceable>, and can be
specified multiple times.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>