On Wed, Dec 18, 2013 at 04:25:45PM +0900, KATOH Yasufumi wrote: > Update for commit df3415e02282317348bbd5f9ce66d03e1c81eeec > > Signed-off-by: KATOH Yasufumi <[email protected]>
Acked-by: Stéphane Graber <[email protected]> > --- > configure.ac | 2 + > doc/ja/Makefile.am | 2 + > doc/ja/lxc-user-nic.sgml.in | 210 > ++++++++++++++++++++++++++++++++++++++++++++ > doc/ja/lxc-usernet.sgml.in | 186 +++++++++++++++++++++++++++++++++++++++ > 4 files changed, 400 insertions(+) > create mode 100644 doc/ja/lxc-user-nic.sgml.in > create mode 100644 doc/ja/lxc-usernet.sgml.in > > diff --git a/configure.ac b/configure.ac > index a1fe61a..9a0b73f 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -546,10 +546,12 @@ AC_CONFIG_FILES([ > doc/ja/lxc-top.sgml > doc/ja/lxc-unfreeze.sgml > doc/ja/lxc-unshare.sgml > + doc/ja/lxc-user-nic.sgml > doc/ja/lxc-version.sgml > doc/ja/lxc-wait.sgml > > doc/ja/lxc.conf.sgml > + doc/ja/lxc-usernet.sgml > doc/ja/lxc.sgml > doc/ja/common_options.sgml > doc/ja/see_also.sgml > diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am > index 6115352..999369c 100644 > --- a/doc/ja/Makefile.am > +++ b/doc/ja/Makefile.am > @@ -29,10 +29,12 @@ man_MANS = \ > lxc-stop.1 \ > lxc-unfreeze.1 \ > lxc-unshare.1 \ > + lxc-user-nic.1 \ > lxc-version.1 \ > lxc-wait.1 \ > \ > lxc.conf.5 \ > + lxc-usernet.5 \ > \ > lxc.7 > > diff --git a/doc/ja/lxc-user-nic.sgml.in b/doc/ja/lxc-user-nic.sgml.in > new file mode 100644 > index 0000000..58d82e5 > --- /dev/null > +++ b/doc/ja/lxc-user-nic.sgml.in > @@ -0,0 +1,210 @@ > +<!-- > + > +lxc: linux Container library > + > +(C) Copyright Canonical Ltd. 2013 > + > +Authors: > +Serge Hallyn <[email protected]> > + > +This library is free software; you can redistribute it and/or > +modify it under the terms of the GNU Lesser General Public > +License as published by the Free Software Foundation; either > +version 2.1 of the License, or (at your option) any later version. > + > +This library is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +Lesser General Public License for more details. > + > +You should have received a copy of the GNU Lesser General Public > +License along with this library; if not, write to the Free Software > +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + > +Translated into Japanese > +by KATOH Yasufumi <karma at jazz.email.ne.jp> > + > +--> > + > +<!DOCTYPE refentry PUBLIC @docdtd@ [ > + > +<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml"> > +<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml"> > +]> > + > +<refentry> > + > + <docinfo><date>@LXC_GENERATE_DATE@</date></docinfo> > + > + <refmeta> > + <refentrytitle>lxc-user-nic</refentrytitle> > + <manvolnum>1</manvolnum> > + </refmeta> > + > + <refnamediv> > + <refname>lxc-user-nic</refname> > + > + <refpurpose> > + <!-- > + Create and attach a nic to another network namespace. > + --> > + NIC を作成し，他のネットワーク名前空間に割り当てる > + </refpurpose> > + </refnamediv> > + > + <refsynopsisdiv> > + <cmdsynopsis> > + <command>lxc-user-nic</command> > + <arg choice="req"><replaceable>pid</replaceable></arg> > + <arg choice="req"><replaceable>type</replaceable></arg> > + <arg choice="req"><replaceable>bridge</replaceable></arg> > + <arg choice="opt"><replaceable>nicname</replaceable></arg> > + </cmdsynopsis> > + </refsynopsisdiv> > + > + <refsect1> > + <title><!-- Description -->説明</title> > + > + <para> > + <!-- > + <command>lxc-user-nic</command> is a setuid-root program with which > + unprivileged users may create network interfaces for use by a lxc > container. > + --> > + <command>lxc-user-nic</command> は root に setuid されたプログラムで，lxc > コンテナが使うネットワークインターフェースを，特権を持たないユーザが作成できます． > + </para> > + <para> > + <!-- > + It will consult the configuration file > <filename>@LXC_USERNIC_CONF@</filename> > + to determine number of interfaces which the calling user is allowed to > + create, and which bridge he may attach them to. It tracks the > + number of interfaces each user has created using the file > + <filename>@LXC_USERNIC_DB@</filename>. It ensures that the calling > + user is privileged over the network namespace to which the interface > + will be attached. > + --> > + このプログラムは，<filename>@LXC_USERNIC_CONF@</filename> > という設定ファイルを参照して，呼び出したユーザが作成することができるインターフェースの数と，どのブリッジに接続するかを決定します．また，ユーザが作成したインターフェースの数を > <filename>@LXC_USERNIC_DB@</filename> > を使ってチェックします．これにより，呼び出したユーザが，インターフェースを割り当てるネットワーク名前空間上で特権を持つことが保証されます． > + </para> > + > + </refsect1> > + > + <refsect1> > + > + <title><!-- Options -->オプション</title> > + > + <variablelist> > + > + <varlistentry> > + <term> > + <option><replaceable>pid</replaceable></option> > + </term> > + <listitem> > + <para> > + <!-- > + The process id for the task to whose network namespace the interface > + should be attached. > + --> > + インターフェースを割り当てたいネットワーク名前空間を持つタスクのプロセス ID． > + </para> > + </listitem> > + </varlistentry> > + > + <varlistentry> > + <term> > + <option><replaceable>type</replaceable></option> > + </term> > + <listitem> > + <para> > + <!-- > + The network interface type to attach. Currently only veth is > + supported. With this type, two interfaces representing each > + tunnel endpoint are created. One endpoint will be attached > + to the specified bridge, while the other will be passed into > + the container. > + --> > + 割り当てるネットワークインターフェースのタイプ．現時点では，veth のみサポートされます． > + このタイプを指定すると，それぞれがトンネルのエンドポイントとなる 2 つのインターフェースが作成されます． > + 一方のエンドポイントは指定したブリッジに接続され，もう一方はコンテナに割り当てられます． > + </para> > + </listitem> > + </varlistentry> > + > + <varlistentry> > + <term> > + <option><replaceable>bridge</replaceable></option> > + </term> > + <listitem> > + <para> > + <!-- > + The bridge to which to attach the network interface, for > + instance <filename>lxcbr0</filename>. > + --> > + ネットワークインターフェースを接続するブリッジ．例えば <filename>lxcbr0</filename> > のように指定します． > + </para> > + </listitem> > + </varlistentry> > + > + <varlistentry> > + <term> > + <option><replaceable>nicname</replaceable></option> > + </term> > + <listitem> > + <para> > + <!-- > + The desired interface name in the container. This will be > + <filename>eth0</filename> if unspecified. > + --> > + コンテナ内に作られるインターフェースの名前．もし指定しない場合，<filename>eth0</filename> となります． > + </para> > + </listitem> > + </varlistentry> > + > + </variablelist> > + > + </refsect1> > + > + &commonoptions; > + > + <refsect1> > + <title>See Also</title> > + > + <simpara> > + <citerefentry> > + <refentrytitle><command>lxc</command></refentrytitle> > + <manvolnum>1</manvolnum> > + </citerefentry>, > + > + <citerefentry> > + <refentrytitle><command>lxc-start</command></refentrytitle> > + <manvolnum>1</manvolnum> > + </citerefentry>, > + > + <citerefentry> > + <refentrytitle><command>lxc-usernet.conf</command></refentrytitle> > + <manvolnum>5</manvolnum> > + </citerefentry> > + </simpara> > + </refsect1> > + > + <refsect1> > + <title>Author</title> > + <para>Daniel Lezcano <email>[email protected]</email></para> > + </refsect1> > + > +</refentry> > + > +<!-- Keep this comment at the end of the file > +Local variables: > +mode: sgml > +sgml-omittag:t > +sgml-shorttag:t > +sgml-minimize-attributes:nil > +sgml-always-quote-attributes:t > +sgml-indent-step:2 > +sgml-indent-data:t > +sgml-parent-document:nil > +sgml-default-dtd-file:nil > +sgml-exposed-tags:nil > +sgml-local-catalogs:nil > +sgml-local-ecat-files:nil > +End: > +--> > diff --git a/doc/ja/lxc-usernet.sgml.in b/doc/ja/lxc-usernet.sgml.in > new file mode 100644 > index 0000000..aaf70f4 > --- /dev/null > +++ b/doc/ja/lxc-usernet.sgml.in > @@ -0,0 +1,186 @@ > +<!-- > + > +lxc: linux Container library > + > +(C) Copyright Canonical Ltd. 2013 > + > +Authors: > +Serge Hallyn <[email protected]> > + > +This library is free software; you can redistribute it and/or > +modify it under the terms of the GNU Lesser General Public > +License as published by the Free Software Foundation; either > +version 2.1 of the License, or (at your option) any later version. > + > +This library is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +Lesser General Public License for more details. > + > +You should have received a copy of the GNU Lesser General Public > +License along with this library; if not, write to the Free Software > +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + > +Translated into Japanese > +by KATOH Yasufumi <karma at jazz.email.ne.jp> > + > +--> > + > +<!DOCTYPE refentry PUBLIC @docdtd@ [ > + > +<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml"> > +]> > + > +<refentry> > + > + <docinfo><date>@LXC_GENERATE_DATE@</date></docinfo> > + > + <refmeta> > + <refentrytitle>lxc-usernet</refentrytitle> > + <manvolnum>5</manvolnum> > + </refmeta> > + > + <refnamediv> > + <refname>lxc-usernet</refname> > + > + <refpurpose> > + <!-- > + unprivileged user network administration file. > + --> > + 非特権ユーザのネットワーク管理用の設定ファイル > + </refpurpose> > + </refnamediv> > + > + <refsect1> > + <title><!-- Description -->説明</title> > + > + <para> > + <!-- > + <filename>@LXC_USERNIC_CONF@</filename> controls the limits which the > + program <command>lxc-user-nic</command> places on network interfaces > + which an unprivileged user may create. > + --> > + <filename>@LXC_USERNIC_CONF@</filename> > は，非特権ユーザが作成する可能性のあるネットワークインターフェースを <command>lxc-user-nic</command> > プログラムが割り当てる際の制限を制御します． > + </para> > + > + <refsect2> > + <title><!-- Configuration -->設定</title> > + <para> > + <!-- > + This file consists of multiple entries, one per line, of the form: > + --> > + このファイルは，一行が以下のような形式の複数のエントリを持つ行から構成されます． > + </para> > + > + <para> > + <command>user</command> <command>type</command> > <command>bridge</command> <command>number</command> > + </para> > + <para> > + <!-- > + Where > + --> > + ここでそれぞれのエントリは以下のような意味を持ちます． > + </para> > + > + <variablelist> > + > + <varlistentry> > + <term> > + <option>user</option> > + </term> > + <listitem> > + <para> > + <!-- > + is the username to whom this entry applies. > + --> > + このエントリを適用するユーザ名 > + </para> > + </listitem> > + </varlistentry> > + > + <varlistentry> > + <term> > + <option>type</option> > + </term> > + <listitem> > + <para> > + <!-- > + is the type of network interface being allowed. Only veth > + is currently supported. > + --> > + 許可されるネットワークインターフェースのタイプ．現時点では veth のみサポートされます． > + </para> > + </listitem> > + </varlistentry> > + > + <varlistentry> > + <term> > + <option>bridge</option> > + </term> > + <listitem> > + <para> > + <!-- > + is the bridge to which the network interfaces may be attached, for > + instance <filename>lxcbr0</filename>. > + --> > + ネットワークインターフェースが接続されるブリッジ．例えば <filename>lxcbr0</filename> > のように指定します． > + </para> > + </listitem> > + </varlistentry> > + > + <varlistentry> > + <term> > + <option>number</option> > + </term> > + <listitem> > + <para> > + <!-- > + is the number of network interfaces of the given type which the > + given user may attach to the given bridge, for instance > <filename>2</filename>. > + --> > + 指定したユーザが，指定したブリッジに接続できる，指定した形式のネットワークインターフェースの数．例えば > <filename>2</filename> のように指定します． > + </para> > + </listitem> > + </varlistentry> > + </variablelist> > + </refsect2> > + > + </refsect1> > + > + <refsect1> > + <title>See Also</title> > + <simpara> > + <citerefentry> > + <refentrytitle><command>lxc</command></refentrytitle> > + <manvolnum>1</manvolnum> > + </citerefentry>, > + <citerefentry> > + <refentrytitle><command>lxc-user-nic</command></refentrytitle> > + <manvolnum>1</manvolnum> > + </citerefentry> > + </simpara> > + </refsect1> > + > + <refsect1> > + <title>Author</title> > + <para>Daniel Lezcano <email>[email protected]</email></para> > + </refsect1> > + > +</refentry> > + > +<!-- Keep this comment at the end of the file > +Local variables: > +mode: sgml > +sgml-omittag:t > +sgml-shorttag:t > +sgml-minimize-attributes:nil > +sgml-always-quote-attributes:t > +sgml-indent-step:2 > +sgml-indent-data:t > +sgml-parent-document:nil > +sgml-default-dtd-file:nil > +sgml-exposed-tags:nil > +sgml-local-catalogs:nil > +sgml-local-ecat-files:nil > +End: > +--> > -- > 1.8.4.4 > > _______________________________________________ > lxc-devel mailing list > [email protected] > http://lists.linuxcontainers.org/listinfo/lxc-devel -- Stéphane Graber Ubuntu developer http://www.ubuntu.com
signature.asc
Description: Digital signature
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
