* sync current English man pages on master branch
* delete lxc-shutdown.sgml.in
* add lxc-snapshot.sgml.in
* update FSF address (same as 250b1eec)
* remove trailing whitespaces in legacy/lxc-ls.sgml.in (same as 8900b9eb)
Snapshots are stored as snapshotted containers under a private configuration path. For instance, if the container's configuration path is <filename>/var/lib/lxc</filename> and the container is <filename>c1</filename>, then the first snapshot will be stored as container <filename>snap0</filename> under configuration path <filename>/var/lib/lxcsnaps/c1</filename>.
When restoring a snapshot, the last optional argument is the name to use for the restored container. If no name is given, then the original container will be destroyed and the restored container will take its place. Note that deleting the original snapshot is not possible in the case of overlayfs or zfs backed snapshots.
@@ -19,7 +19,7 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
...
...
@@ -75,10 +75,10 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
The configuration file defines the different system resources to
be assigned for the container. At present, the utsname, the
network, the mount points, the root file system and the control
groups are supported.
network, the mount points, the root file system, the user namespace,
and the control groups are supported.
-->
設定ファイルは，コンテナに割り当てられる様々なシステムリソースを定義します．現時点では，utsname，ネットワーク，マウントポイント，root ファイルシステム，control groups がサポートされます．
設定ファイルは，コンテナに割り当てられる様々なシステムリソースを定義します．現時点では，utsname，ネットワーク，マウントポイント，root ファイルシステム，ユーザ名前空間，control groups がサポートされます．
</para>
<para>
...
...
@@ -91,12 +91,44 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</para>
<refsect2>
<title><!-- Configuration -->設定</title>
<para>
<!--
In order to ease administration of multiple related containers, it
is possible to have a container configuration file cause another
file to be loaded. For instance, network configuration
can be defined in one common file which is included by multiple
containers. Then, if the containers are moved to another host,
only one file may need to be updated.
-->
複数の関係するコンテナの管理を容易にするために，コンテナの設定ファイルに別のファイルをロードすることが可能です．例えば，ネットワークの設定を，複数のコンテナから include させるように 1 つのファイルに定義することが可能です．その場合，コンテナが他のホストに移動すると，そのファイルだけを更新する必要があるかもしれません．
</para>
<variablelist>
<varlistentry>
<term>
<option>lxc.include</option>
</term>
<listitem>
<para>
<!--
Specify the file to be included. The included file must be
in the same valid lxc configuration file format.
-->
include させたいファイルを指定します．include するファイルは，lxc 設定ファイルのフォーマットとして有効でなければいけません．
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect2>
<refsect2>
<title><!-- Architecture -->アーキテクチャ</title>
<para>
<!--
Allows to set the architecture for the container. For example,
set a 32bits architecture for a container running 32bits
binaries on a 64bits host. That fix the container scripts
binaries on a 64bits host. That fixes the container scripts
which rely on the architecture to do some work like
downloading the packages.
-->
...
...
@@ -285,7 +317,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
bridge is set up as a reflective relay. Broadcast
frames coming in from the upper_dev get flooded to all
macvlan interfaces in VEPA mode, local frames are not
delivered locallay, or <option>bridge</option>, it
delivered locally, or <option>bridge</option>, it
provides the behavior of a simple bridge between
different macvlan interfaces on the same port. Frames
from one interface to another one get delivered directly
...
...
@@ -322,7 +354,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
ネットワークに対して行うアクションを指定します．
</para>
<para>
<!--
<option>up:</option> activates the interface.
...
...
@@ -490,13 +522,17 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
veth/macvlan/phys. And finally (host-sided) device name.
When a container hook is executed, information is passed both
as command line arguments and through environment variables.
The arguments are:
<itemizedlist>
<listitem> Container name. </listitem>
<listitem> Section (always 'lxc'). </listitem>
<listitem> The hook type (i.e. 'clone' or 'pre-mount'). </listitem>
<listitem> Additional arguments In the
case of the clone hook, any extra arguments passed to
lxc-clone will appear as further arguments to the hook. </listitem>
</itemizedlist>
The following environment variables are set:
<itemizedlist>
<listitem> LXC_NAME: is the container's name. </listitem>
<listitem> LXC_ROOTFS_MOUNT: the path to the mounted root filesystem. </listitem>
<listitem> LXC_CONFIG_FILE: the path to the container configuration file. </listitem>
<listitem> LXC_SRC_NAME: in the case of the clone hook, this is the original container's name. </listitem>
<listitem> LXC_ROOTFS_PATH: this is the lxc.rootfs enty for the container. Note this is likely not where the mounted rootfs is to be found, use LXC_ROOTFS_MOUNT for that. </listitem>
