Skip to content

L
lxc
Commit a600d021 by KATOH Yasufumi Committed by Stéphane Graber
Options

doc: Update man pages to the latest information

* lxc-attach(1): Update to the status of kernel 3.8 or higher * lxc-create(1), lxc-destroy(1): Now lxc-ls don't have "-l" option, so remove * lxc(7): update description of lxc-ls and lxc-info to current version * see-also: fix lxc(1) to lxc(7) Signed-off-by: 's avatarKATOH Yasufumi <karma@jazz.email.ne.jp> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 5fd9f759
Showing with 29 additions and 63 deletions
doc/ja/lxc-attach.sgml.in
...@@ -339,13 +339,14 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -339,13 +339,14 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<para> <para>
<!-- <!--
Attaching completely (including the pid and mount namespaces) to a Attaching completely (including the pid and mount namespaces) to a
container requires a patched kernel, please see the lxc website for container requires a kernel of version 3.8 or higher, or a
patched kernel, please see the lxc website for
details. <command>lxc-attach</command> will fail in that case if details. <command>lxc-attach</command> will fail in that case if
used with an unpatched kernel. used with an unpatched kernel of version 3.7 and prior.
--> -->
(pid とマウント名前空間を含む) コンテナに対する完全なアタッチを行うにはパッチを適用したカーネルが必要となります． (pid とマウント名前空間を含む) コンテナに対する完全なアタッチを行うには 3.8 以上，もしくはパッチを適用したカーネルが必要となります．
詳しくは lxc のウェブサイトを参照してください． 詳しくは lxc のウェブサイトを参照してください．
(訳注: 3.8 カーネルから PID, マウント名前空間に対するアタッチも可能になっている) パッチが当たっていない 3.8 より小さなバージョンのカーネルを使った場合は，<command>lxc-attach</command> の実行は失敗するでしょう．
</para> </para>
<para> <para>
<!-- <!--
...@@ -359,12 +360,10 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -359,12 +360,10 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</para> </para>
<para> <para>
<!-- <!--
Attaching to user namespaces is currently completely unsupported Attaching to user namespaces is supported by kernel 3.8 or higher
by the kernel. <command>lxc-attach</command> should however be able with enabling user namespace.
to do this once once future kernel versions implement this.
--> -->
ユーザ名前空間へのアタッチは，現時点ではカーネルで完全にサポートされていません． ユーザ名前空間へのアタッチは，ユーザ名前空間機能を有効にした 3.8 以上のカーネルでサポートされます．
しかし，<command>lxc-attach</command> は，将来のカーネルがこの機能を実装した時点ですぐに，アタッチが可能になるはずです．
</para> </para>
</refsect1> </refsect1>
......
doc/ja/lxc-create.sgml.in
...@@ -233,11 +233,11 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -233,11 +233,11 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!-- <!--
As the message mention it, you try to create a container As the message mention it, you try to create a container
but there is a container with the same name. You can use but there is a container with the same name. You can use
the <command>lxc-ls -l</command> command to list the the <command>lxc-ls</command> command to list the
available containers on the system. available containers on the system.
--> -->
メッセージの通り，コンテナを作成しようとしたけれども，同じ名前のコンテナが存在しています． メッセージの通り，コンテナを作成しようとしたけれども，同じ名前のコンテナが存在しています．
<command>lxc-ls -l</command> コマンドを使って，システム上に存在する利用可能なコンテナのリストが表示できます． <command>lxc-ls</command> コマンドを使って，システム上に存在する利用可能なコンテナのリストが表示できます．
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
doc/ja/lxc-destroy.sgml.in
...@@ -123,12 +123,12 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -123,12 +123,12 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!-- <!--
The specified container for destruction was not found. It The specified container for destruction was not found. It
is probable it does not exists and was already is probable it does not exists and was already
destroyed.You can use the <command>lxc-ls -l</command> destroyed.You can use the <command>lxc-ls</command>
command to list the available containers on the system. command to list the available containers on the system.
--> -->
破壊するために指定したコンテナが見つかりません． 破壊するために指定したコンテナが見つかりません．
おそらくそのコンテナが存在しないのか，既に破壊された後なのでしょう． おそらくそのコンテナが存在しないのか，既に破壊された後なのでしょう．
<command>lxc-ls -l</command> コマンドを使って，システム上に存在するコンテナのリストを得ることができます． <command>lxc-ls</command> コマンドを使って，システム上に存在するコンテナのリストを得ることができます．
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
doc/ja/lxc.sgml.in
...@@ -697,35 +697,15 @@ rootfs ...@@ -697,35 +697,15 @@ rootfs
<para> <para>
<!-- <!--
<command>lxc-ls</command> lists the containers of the <command>lxc-ls</command> lists the containers of the
system. The command is a script built on top system.
of <command>ls</command>, so it accepts the options of the ls
commands, eg:
<programlisting>
lxc-ls -C1
</programlisting>
will display the containers list in one column or:
<programlisting>
lxc-ls -l
</programlisting>
will display the containers list and their permissions.
--> -->
<command>lxc-ls</command> は，システムのコンテナを一覧します． <command>lxc-ls</command> は，システムのコンテナを一覧します．
このコマンドは <command>ls</command> をうまく利用して作られているスクリプトです．
なので，ls コマンドのオプションを受け付けます．例えば
<programlisting>
lxc-ls -C1
</programlisting>
はコンテナのリストを 1 列で表示しますし，
<programlisting>
lxc-ls -l
</programlisting>
はコンテナのリストとパーミッションを表示します．
</para> </para>
<para> <para>
<!-- <!--
<command>lxc-ps</command> will display the pids for a specific <command>lxc-ps</command> will display the pids for a specific
container. Like <command>lxc-ls</command>, <command>lxc-ps</command> container. <command>lxc-ps</command>
is built on top of <command>ps</command> and accepts the same is built on top of <command>ps</command> and accepts the same
options, eg: options, eg:
<programlisting>lxc-ps &#045;&#045;name foo &#045;&#045;forest</programlisting> <programlisting>lxc-ps &#045;&#045;name foo &#045;&#045;forest</programlisting>
...@@ -736,7 +716,7 @@ rootfs ...@@ -736,7 +716,7 @@ rootfs
will display all the containers and their processes. will display all the containers and their processes.
--> -->
<command>lxc-ps</command> は特定のコンテナに対する pid を表示します． <command>lxc-ps</command> は特定のコンテナに対する pid を表示します．
<command>lxc-ls</command> のように，<command>lxc-ps</command> は <command>ps</command> コマンドをうまく利用して作られており，同じオプションを利用可能です． <command>lxc-ps</command> は <command>ps</command> コマンドをうまく利用して作られており，同じオプションを利用可能です．
例えば， 例えば，
<programlisting>lxc-ps --name foo --forest</programlisting> <programlisting>lxc-ps --name foo --forest</programlisting>
は 'foo' という名前のコンテナに属するプロセスを階層構造で表示します． は 'foo' という名前のコンテナに属するプロセスを階層構造で表示します．
...@@ -748,11 +728,9 @@ rootfs ...@@ -748,11 +728,9 @@ rootfs
<para> <para>
<!-- <!--
<command>lxc-info</command> gives information for a specific <command>lxc-info</command> gives information for a specific
container, at present time, only the state of the container is container.
displayed.
--> -->
<command>lxc-info</command> は，指定したコンテナに対する情報を与えます． <command>lxc-info</command> は，指定したコンテナに関する情報を取得します．
現時点では，コンテナの状態だけを表示します．
</para> </para>
<para> <para>
......
doc/ja/see_also.sgml.in
...@@ -32,7 +32,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> ...@@ -32,7 +32,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<simpara> <simpara>
<citerefentry> <citerefentry>
<refentrytitle><command>lxc</command></refentrytitle> <refentrytitle><command>lxc</command></refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>7</manvolnum>
</citerefentry>, </citerefentry>,
<citerefentry> <citerefentry>
......
doc/lxc-attach.sgml.in
...@@ -257,9 +257,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -257,9 +257,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<title>Compatibility</title> <title>Compatibility</title>
<para> <para>
Attaching completely (including the pid and mount namespaces) to a Attaching completely (including the pid and mount namespaces) to a
container requires a patched kernel, please see the lxc website for container requires a kernel of version 3.8 or higher, or a
patched kernel, please see the lxc website for
details. <command>lxc-attach</command> will fail in that case if details. <command>lxc-attach</command> will fail in that case if
used with an unpatched kernel. used with an unpatched kernel of version 3.7 and prior.
</para> </para>
<para> <para>
Nevertheless, it will succeed on an unpatched kernel of version 3.0 Nevertheless, it will succeed on an unpatched kernel of version 3.0
...@@ -269,9 +270,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -269,9 +270,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
and <replaceable>UTSNAME</replaceable>. and <replaceable>UTSNAME</replaceable>.
</para> </para>
<para> <para>
Attaching to user namespaces is currently completely unsupported Attaching to user namespaces is supported by kernel 3.8 or higher
by the kernel. <command>lxc-attach</command> should however be able with enabling user namespace.
to do this once once future kernel versions implement this.
</para> </para>
</refsect1> </refsect1>
......
doc/lxc-create.sgml.in
...@@ -184,7 +184,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -184,7 +184,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<para> <para>
As the message mention it, you try to create a container As the message mention it, you try to create a container
but there is a container with the same name. You can use but there is a container with the same name. You can use
the <command>lxc-ls -l</command> command to list the the <command>lxc-ls</command> command to list the
available containers on the system. available containers on the system.
</para> </para>
</listitem> </listitem>
......
doc/lxc-destroy.sgml.in
...@@ -104,7 +104,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -104,7 +104,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<para> <para>
The specified container for destruction was not found. It The specified container for destruction was not found. It
is probable it does not exists and was already is probable it does not exists and was already
destroyed.You can use the <command>lxc-ls -l</command> destroyed.You can use the <command>lxc-ls</command>
command to list the available containers on the system. command to list the available containers on the system.
</para> </para>
</listitem> </listitem>
......
doc/lxc.sgml.in
...@@ -463,22 +463,12 @@ rootfs ...@@ -463,22 +463,12 @@ rootfs
</para> </para>
<para> <para>
<command>lxc-ls</command> lists the containers of the <command>lxc-ls</command> lists the containers of the
system. The command is a script built on top system.
of <command>ls</command>, so it accepts the options of the ls
commands, eg:
<programlisting>
lxc-ls -C1
</programlisting>
will display the containers list in one column or:
<programlisting>
lxc-ls -l
</programlisting>
will display the containers list and their permissions.
</para> </para>
<para> <para>
<command>lxc-ps</command> will display the pids for a specific <command>lxc-ps</command> will display the pids for a specific
container. Like <command>lxc-ls</command>, <command>lxc-ps</command> container. <command>lxc-ps</command>
is built on top of <command>ps</command> and accepts the same is built on top of <command>ps</command> and accepts the same
options, eg: options, eg:
<programlisting>lxc-ps --name foo --forest</programlisting> <programlisting>lxc-ps --name foo --forest</programlisting>
...@@ -491,8 +481,7 @@ rootfs ...@@ -491,8 +481,7 @@ rootfs
<para> <para>
<command>lxc-info</command> gives information for a specific <command>lxc-info</command> gives information for a specific
container, at present time, only the state of the container is container.
displayed.
</para> </para>
<para> <para>
......
doc/see_also.sgml.in
...@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<simpara> <simpara>
<citerefentry> <citerefentry>
<refentrytitle><command>lxc</command></refentrytitle> <refentrytitle><command>lxc</command></refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>7</manvolnum>
</citerefentry>, </citerefentry>,
<citerefentry> <citerefentry>
......
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