[lxc-devel] [PATCH 1/1] doc: Update Japanese man pages translation
KATOH Yasufumi
karma at jazz.email.ne.jp
Fri Sep 27 07:21:54 UTC 2013
* sync current English man pages on master branch
* delete lxc-shutdown.sgml.in
* add lxc-snapshot.sgml.in
* update FSF address (same as 250b1eec71b074acdff1c5f6b5a1f0d7d2c20b77)
* remove trailing whitespaces in legacy/lxc-ls.sgml.in (same as 8900b9eb2514c07047541833286428572493a9fd)
Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
---
doc/ja/common_options.sgml.in | 2 +-
doc/ja/legacy/lxc-ls.sgml.in | 5 +-
doc/ja/lxc-attach.sgml.in | 2 +-
doc/ja/lxc-cgroup.sgml.in | 2 +-
doc/ja/lxc-checkconfig.sgml.in | 2 +-
doc/ja/lxc-checkpoint.sgml.in | 2 +-
doc/ja/lxc-clone.sgml.in | 182 +++++++++++++++----
doc/ja/lxc-console.sgml.in | 18 +-
doc/ja/lxc-create.sgml.in | 18 +-
doc/ja/lxc-destroy.sgml.in | 2 +-
doc/ja/lxc-device.sgml.in | 5 +-
doc/ja/lxc-execute.sgml.in | 14 +-
doc/ja/lxc-freeze.sgml.in | 2 +-
doc/ja/lxc-info.sgml.in | 38 +++-
doc/ja/lxc-kill.sgml.in | 2 +-
doc/ja/lxc-ls.sgml.in | 2 +-
doc/ja/lxc-monitor.sgml.in | 23 +--
doc/ja/lxc-netstat.sgml.in | 2 +-
doc/ja/lxc-ps.sgml.in | 16 +-
doc/ja/lxc-restart.sgml.in | 2 +-
doc/ja/lxc-shutdown.sgml.in | 107 -----------
doc/ja/lxc-snapshot.sgml.in | 188 +++++++++++++++++++
doc/ja/lxc-start-ephemeral.sgml.in | 3 +-
doc/ja/lxc-start.sgml.in | 2 +-
doc/ja/lxc-stop.sgml.in | 114 +++++++++++-
doc/ja/lxc-top.sgml.in | 2 +-
doc/ja/lxc-unfreeze.sgml.in | 2 +-
doc/ja/lxc-unshare.sgml.in | 12 +-
doc/ja/lxc-version.sgml.in | 2 +-
doc/ja/lxc-wait.sgml.in | 2 +-
doc/ja/lxc.conf.sgml.in | 360 +++++++++++++++++++++++++++++++++----
doc/ja/lxc.sgml.in | 2 +-
doc/ja/see_also.sgml.in | 2 +-
33 files changed, 882 insertions(+), 257 deletions(-)
delete mode 100644 doc/ja/lxc-shutdown.sgml.in
create mode 100644 doc/ja/lxc-snapshot.sgml.in
diff --git a/doc/ja/common_options.sgml.in b/doc/ja/common_options.sgml.in
index 77c4639..ceefd8d 100644
--- a/doc/ja/common_options.sgml.in
+++ b/doc/ja/common_options.sgml.in
@@ -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>
diff --git a/doc/ja/legacy/lxc-ls.sgml.in b/doc/ja/legacy/lxc-ls.sgml.in
index 077d4fa..1cf62ca 100644
--- a/doc/ja/legacy/lxc-ls.sgml.in
+++ b/doc/ja/legacy/lxc-ls.sgml.in
@@ -1,4 +1,3 @@
-
<!--
lxc: linux Container library
@@ -20,9 +19,9 @@ 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
+Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
diff --git a/doc/ja/lxc-attach.sgml.in b/doc/ja/lxc-attach.sgml.in
index 0d75d3e..346ba54 100644
--- a/doc/ja/lxc-attach.sgml.in
+++ b/doc/ja/lxc-attach.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-cgroup.sgml.in b/doc/ja/lxc-cgroup.sgml.in
index 8e77d20..203a0be 100644
--- a/doc/ja/lxc-cgroup.sgml.in
+++ b/doc/ja/lxc-cgroup.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-checkconfig.sgml.in b/doc/ja/lxc-checkconfig.sgml.in
index e53ea25..75895c6 100644
--- a/doc/ja/lxc-checkconfig.sgml.in
+++ b/doc/ja/lxc-checkconfig.sgml.in
@@ -17,7 +17,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>
diff --git a/doc/ja/lxc-checkpoint.sgml.in b/doc/ja/lxc-checkpoint.sgml.in
index bcb761d..5c44431 100644
--- a/doc/ja/lxc-checkpoint.sgml.in
+++ b/doc/ja/lxc-checkpoint.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-clone.sgml.in b/doc/ja/lxc-clone.sgml.in
index 54cef22..096ef97 100644
--- a/doc/ja/lxc-clone.sgml.in
+++ b/doc/ja/lxc-clone.sgml.in
@@ -20,7 +20,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>
@@ -56,13 +56,31 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<refsynopsisdiv>
<cmdsynopsis>
<command>lxc-clone</command>
+ <arg choice="opt">-s </arg>
+ <arg choice="opt">-K </arg>
+ <arg choice="opt">-M </arg>
+ <arg choice="opt">-H </arg>
+ <arg choice="opt">-B <replaceable>backingstore</replaceable></arg>
+ <arg choice="opt">-L <replaceable>fssize</replaceable></arg>
+ <arg choice="opt">-p <replaceable>lxcpath</replaceable></arg>
+ <arg choice="opt">-P <replaceable>newlxcpath</replaceable></arg>
<arg choice="req">-o <replaceable>orig</replaceable></arg>
<arg choice="req">-n <replaceable>new</replaceable></arg>
+ <arg choice="opt">-- hook arguments</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>lxc-clone</command>
<arg choice="opt">-s </arg>
+ <arg choice="opt">-K </arg>
+ <arg choice="opt">-M </arg>
+ <arg choice="opt">-H </arg>
+ <arg choice="opt">-B <replaceable>backingstore</replaceable></arg>
<arg choice="opt">-L <replaceable>fssize</replaceable></arg>
- <arg choice="opt">-v <replaceable>vgname</replaceable></arg>
- <arg choice="opt">-p <replaceable>lxc_lv_prefix</replaceable></arg>
- <arg choice="opt">-t <replaceable>fstype</replaceable></arg>
+ <arg choice="opt">-p <replaceable>lxcpath</replaceable></arg>
+ <arg choice="opt">-P <replaceable>newlxcpath</replaceable></arg>
+ <arg choice="req">orig</arg>
+ <arg choice="req">new</arg>
+ <arg choice="opt">-- hook arguments</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -71,12 +89,37 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<para>
<!--
- <command>lxc-clone</command> Creates a new container as a copy of an existing
- container. When the original container's rootfs is an LVM block device or
- is on a btrfs filesystem, then a snapshotted clone can be created, taking up
- very little initial disk space.
+ <command>lxc-clone</command> Creates a new container as a clone of an existing
+ container. Two types of clones are supported: copy and snapshot. A copy
+ clone copies the root filessytem from the original container to the new. A
+ snapshot filesystem uses the backing store's snapshot functionality to create
+ a very small copy-on-write snapshot of the original container. Snapshot
+ clones require the new container backing store to support snapshotting. Currently
+ this includes only btrfs, lvm, overlayfs and zfs. LVM devices do not support
+ snapshots fo snapshots.
-->
- <command>lxc-clone</command> )Bã$)B¯ï)B¼Œæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã‚’æ—$)B¢ã)B$)B«å)B˜åœ$)B¨ã)B™ã‚‹ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B³ã)Bƒ”ãƒ$)B¼ã)B$)B¨ã)B—ã$)B¦ä)B½œ$)B製ã)B™ã‚‹$)B．å)B…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® rootfs ㌠LVM ブãƒ$)Bã)Bƒƒã‚$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B‹ btrfs $)Bä¸)BŠã$)B«ã)B‚ã‚‹å $)B´å)Bˆã$)B¯ï)B¼Œéž$)B常ã)B$)B«å)B°‘ã$)Bªã)B„デã‚$)B£ã)B‚$)B¹ã)B‚$)B¯ã)B‚$)B¹ã)Bƒšãƒ$)B¼ã)B‚$)B¹ã)B$)B§æ)B¸ˆã‚€ã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B«ã)B‚ˆã‚Šã‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B‚’$)Bä½)Bœ$)B製ã)B™ã‚‹$)Bï¼
+ <command>lxc-clone</command> )Bã$)B¯ï)B¼Œæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã‚’æ—$)B¢ã)B$)B«å)B˜åœ$)B¨ã)B™ã‚‹ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B$)B¨ã)B—ã$)B¦ä)B½œ$)B製ã)B—ã$)B¾ã)B™$)B．ã)B‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B¯ 2 ã$)B¤ã)B$)B®ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ—ã‚’ã‚$)Bµã)Bƒãƒ$)B¼ã)Bƒˆã—ã$)B¾ã)B™: ã‚$)B³ã)Bƒ”ãƒ$)B¼ã)B$)B¨ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B§ã)B™$)B．ã)B‚$)B³ã)Bƒ”ãƒ$)B¼ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ—ã$)B®ã)B‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B$)B¯å)B…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã‹ã‚‰æ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã¸ root フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã‚’ã‚$)B³ã)Bƒ”ãƒ$)B¼ã)B—ã$)B¾ã)B™$)B．ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã$)B¯ï)B¼Œãƒãƒƒã‚$)Bã)Bƒ$)B³ã)B‚$)B°ã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆ$)Bæ©)BŸèƒ$)B½ã)B‚’$)B使ã)B„$)Bï¼)BŒå…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®é)Bž$)B常ã)B$)B«å)B°ã•ãª copy-on-write ã$)B§ã)B$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã‚’$)Bä½)Bœ$)B製ã)B—ã$)B¾ã)B™$)B．ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B§ã)B$)B®ã)B‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B$)B¯ï)B¼Œæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒãƒƒã‚$)Bã)Bƒ$)B³ã)B‚$)B°ã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B$)B¨ã)B—ã$)B¦ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆ$)Bæ©)BŸèƒ$)B½ã)B$)B®ã)B‚$)Bµã)Bƒãƒ$)B¼ã)BƒˆãŒ$)Bå¿)B…$)Bè¦)Bã$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™$)B．ç¾æ)B™‚ç‚$)B¹ã)B$)B§ã)B$)B¯ï)B¼Œã“ã$)B®ã)B‚ˆã†ã$)Bªã)Bƒãƒƒã‚$)Bã)Bƒ$)B³ã)B‚$)B°ã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B$)B¨ã)B—ã$)B¦ã)B¯ btrfs, lvm, overlayfs, zfs ã$)B®ã)B$)B¿ã)B‚’ã‚$)Bµã)Bƒãƒ$)B¼ã)Bƒˆã—ã$)B¾ã)B™$)B．ÌVM )Bデãƒã‚$)B¤ã)B‚$)B¹ã)B$)B¯ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B¯ã)B‚$)Bµã)Bƒãƒ$)B¼ã)Bƒˆã—ã$)B¦ã)B„ã$)B¾ã)B›ã‚“$)Bï¼
+ </para>
+
+ <para>
+ <!--
+ The backing store of the new container will be the same type as the
+ original container,
+ with one exception: overlayfs snapshots can be created of directory backed
+ containers. This can be requested by using the <replaceable>-B overlayfs</replaceable>
+ arguments.
+ -->
+ )Bæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒãƒƒã‚$)Bã)Bƒ$)B³ã)B‚$)B°ã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B$)B¯ï)B¼Œ$)Bä¸)B€ã$)B¤ã)B$)B®ä)B¾‹$)Bå¤)B–ã‚’é™$)B¤ã)B„ã$)B¦ã)B$)B¯ï)B¼Œå…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ—ã$)B¨å)BŒã˜ã$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™: overlayfs ã$)B§ã)B$)B¯ï)B¼Œãƒ‡ã‚$)B£ã)Bƒ$)B¬ã)B‚$)B¯ã)Bƒˆãƒ$)Bªã)Bƒãƒƒã‚$)B¯ã)B‚$)B¨ã)Bƒ$)B³ã)Bƒ‰ã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã‚’$)Bä½)Bœ$)B製ã)B™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．ã)B“ã‚Œã$)B¯ï)B¼Œ<replaceable>-B overlayfs</replaceable> ã$)B¨ã)B„ã†$)Bå¼)B•æ•$)B°ã)B‚’$)B使ã)B$)B£ã)B$)B¦æ)BŒ‡$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)Bï¼
+ </para>
+
+ <para>
+ <!--
+ The names of the original and new container can be given (in that order)
+ after all options, or can be specified with the
+ <replaceable>-o</replaceable> and <replaceable>-n</replaceable> options,
+ respectively.
+ -->
+ )Bå…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B¨æ)B–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)Bå‰ã$)B¯ï)B¼Œå…$)B¨ã)B$)B¦ã)B$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B®å)B¾Œã$)B«é)B †ç•$)Bªã)B$)B«ä)B¸Žãˆã‚‹ã“ã$)B¨ã)B‚‚$)Bï¼)BŒ<replaceable>-o</replaceable> 㨠<replaceable>-n</replaceable> ã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B‚’$)B使ã)B$)B£ã)B$)B¦ã)Bã‚Œãžã‚ŒæŒ‡$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)B‚‚å¯èƒ$)B½ã)B$)B§ã)B™$)Bï¼
</para>
</refsect1>
@@ -89,42 +132,59 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<varlistentry>
<term>
- <option>-o, --orig <replaceable>orig</replaceable></option>
+ <option>-s, --snapshot</option>
</term>
<listitem>
<para>
<!--
- The name of the original container to clone.
+ The new container's rootfs should be a LVM or btrfs snapshot of the original.
-->
- )Bã‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³å)B…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)Bå‰$)Bï¼
+ )Bæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® rootfs ã$)B¯ï)B¼Œã‚$)Bªã)Bƒ$)Bªã)B‚$)B¸ã)BƒŠãƒ$)B«ã)B® LVM ã‹ btrfs ã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™$)Bï¼
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
- <option>-n, --new <replaceable>new</replaceable></option>
+ <option>-K, --keepname</option>
</term>
<listitem>
<para>
<!--
- The name of the new container to create.
+ Do not change the hostname of the container (in the root
+ filesystem).
-->
- )Bæ–$)B°ã)B—ã作$)B製ã)B™ã‚‹ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)Bå‰$)Bï¼
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ›ã‚$)B¹ã)Bƒˆåã‚’$)Bå¤)B‰æ›$)B´ã)B—ã$)B¾ã)B›ã‚“ (root フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ 内ã$)B§ã)B¯)$)Bï¼
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
- <option>-s, --snapshot</option>
+ <option>-M, --keepmac</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Use the same MAC address as the original container, rather tahn
+ generating a new random one.
+ -->
+ )Bæ–$)B°ã)B—ã„ MAC ã‚$)B¢ã)Bƒ‰ãƒ$)B¬ã)B‚$)B¹ã)B‚’ãƒ$)B©ã)Bƒ$)B³ã)Bƒ€ãƒ ã$)B«ç)B”Ÿæˆã›ãšã$)B«ï)B¼Œå…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B¨å)BŒã˜ MAC ã‚$)B¢ã)Bƒ‰ãƒ$)B¬ã)B‚$)B¹ã)B‚’$)B使ç)B”$)B¨ã)B—ã$)B¾ã)B™$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>-H, --copyhooks</option>
</term>
<listitem>
<para>
<!--
- The new container's rootfs should be a LVM or btrfs snapshot of the original.
+ Copy all mount hooks into the new container's directory, and
+ update any lxcpaths and container names as needed.
-->
- )Bæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® rootfs ã‚’$)Bï¼)BŒå…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® LVM ã‚‚ã—ã㯠btrfs ã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B¨ã)B™ã‚‹$)Bï¼
+ )Bå…$)B¨ã)B$)B¦ã)B$)B®ã)Bƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆãƒ•ãƒƒã‚$)B¯ã)B‚’æ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ‡ã‚$)B£ã)Bƒ$)B¬ã)B‚$)B¯ã)Bƒˆãƒ$)Bªã)B$)B«ã)B‚$)B³ã)Bƒ”ãƒ$)B¼ã)B—ã$)B¾ã)B™$)B．ã)Bã—ã$)B¦ï)B¼Œlxcpath ã$)B¨ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠåã‚’$)Bå¿)B…$)Bè¦)Bã$)B«å)B¿œã˜ã$)B¦æ)B›$)B´æ)B–$)B°ã)B—ã$)B¾ã)B™$)Bï¼
</para>
</listitem>
</varlistentry>
@@ -136,67 +196,119 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<listitem>
<para>
<!--
- In the case of a LVM-backed container, a size for the new
+ In the case of a block device backed container, a size for the new
block device. By default, the new device will be made the
same size as the original.
-->
- LVM ä¸)BŠã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)B $)B´å)Bˆã$)B®æ)B–$)B°ã)B—ã„ブãƒ$)Bã)Bƒƒã‚$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B$)B®ã)B‚$)Bµã)B‚$)B¤ã)B‚$)Bºï)B¼Žãƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B§ã)B$)B¯ï)B¼Œæ–$)B°ã)B—ã„デãƒã‚$)B¤ã)B‚$)B¹ã)B$)B¯å)B…ƒã$)B®ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B$)B¨å)BŒã˜ã‚$)Bµã)B‚$)B¤ã)B‚$)Bºã)B$)B¨ã)B$)Bªã)B‚‹$)Bï¼
+ )Bブãƒ$)Bã)Bƒƒã‚$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B$)B®ã)Bƒãƒƒã‚$)B¯ã)B‚$)B¨ã)Bƒ$)B³ã)Bƒ‰ã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)B $)B´å)Bˆ$)Bï¼)BŒæ–$)B°ã)B—ã„ブãƒ$)Bã)Bƒƒã‚$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B$)B®ã)B‚$)Bµã)B‚$)B¤ã)B‚$)Bºï)B¼Žãƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B§ã)B$)B¯ï)B¼Œæ–$)B°ã)B—ã„デãƒã‚$)B¤ã)B‚$)B¹ã)B$)B¯å)B…ƒã$)B®ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B$)B¨å)BŒã˜ã‚$)Bµã)B‚$)B¤ã)B‚$)Bºã)B$)B¨ã)B$)Bªã)B‚Šã$)B¾ã)B™$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>-p, --lxcpath <replaceable>fssize</replaceable></option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ The lxcpath of the original container. By default, the system
+ wide configured lxcpath will be used.
+ -->
+ )Bã‚$)Bªã)Bƒ$)Bªã)B‚$)B¸ã)BƒŠãƒ$)B«ã)B$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® lxcpath$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B§ã)B$)B¯ï)B¼Œã‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ å…$)B¨ä)B½“ã$)B§è¨å®)Bšã•ã‚ŒãŸ lxcpath ãŒ$)B使ã)B‚ã‚Œã$)B¾ã)B™$)Bï¼
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
- <option>-v, --vgname <replaceable>vgname</replaceable></option>
+ <option>-P, --newpath <replaceable>fssize</replaceable></option>
</term>
<listitem>
<para>
<!--
- For an LVM-backed container, the volume group name to use. By
- default it is 'lxc'.
+ The lxcpath for the new container. By default the same lxcpath
+ as the original will be used. Note that with btrfs snapshots,
+ changing lxcpaths may not be possible, as subvolume snapshots
+ must be in the same btrfs filesystem.
-->
- LVM ä¸)BŠã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å¯¾)Bã—ã$)B¦ä½¿)Bç”$)B¨ã)B™ã‚‹ãƒœãƒ$)Bªã)Bƒ$)B¥ã)Bƒ$)B¼ã)Bƒ ã‚$)B°ã)Bƒ$)B«ã)Bƒ$)B¼ã)Bƒ—ã$)B®å)Bå‰$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã¯ 'lxc' ã$)B§ã)B‚ã‚‹$)Bï¼
+ )Bæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® lxcpath$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B§ã)B$)B¯ï)B¼Œã‚$)Bªã)Bƒ$)Bªã)B‚$)B¸ã)BƒŠãƒ$)B«ã)B® lxcpath ã$)B¨å)BŒã˜ã‚‚ã$)B®ã)BŒ$)B使ã)B‚ã‚Œã$)B¾ã)B™$)B．âtrfs )Bã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B®å)B $)B´å)Bˆã$)B¯æ³¨)Bæ„ãŒ$)Bå¿)B…$)Bè¦)Bã$)B§ï)B¼Œlxcpath ã$)B®å)B¤‰æ›$)B´ã)B$)B¯ã)B$)B§ã)Bã$)Bªã)B„å¯èƒ$)B½æ)B€$)B§ã)BŒã‚ã‚Šã$)B¾ã)B™$)B．ã)B“れ㯠subvolume ã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)BƒƒãƒˆãŒ$)Bï¼)BŒåŒã˜ btrfs フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ $)Bä¸)BŠã$)B«å)B˜åœ$)B¨ã)B—ã$)Bªã)B‘ã‚Œã$)B°ã)B$)Bªã)B‚‰ã$)Bªã)B„ã‹ã‚‰ã$)B§ã)B™$)Bï¼
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
- <option>-p, --lvprefix <replaceable>lxc_lv_prefix</replaceable></option>
+ <option>-B, --backingstore <replaceable>fssize</replaceable></option>
</term>
<listitem>
<para>
<!--
- For an LVM-backed container, a string to prefix to the container name to
- form the logical volume name. For instance, specifying
- <command>-n c1 -p lxc_</command> will cause the container rootfs to
- be on a logical volume called <replaceable>lxc_c1</replaceable>.
+ Select a different backing store for the new container. By
+ default the same as the original container's is used. Note that
+ currently changing the backingstore is only supported for
+ overlayfs snapshots of directory backed containers. Valid
+ backing stores include dir (directory), btrfs, lvm, zfs, loop
+ and overlayfs.
-->
- LVM ä¸)BŠã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B§ï)B¼Œ$)Bè«)B–ç†ãƒœãƒ$)Bªã)Bƒ$)B¥ã)Bƒ$)B¼ã)Bƒ åを生æˆã™ã‚‹ãŸã‚ã$)B«ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠåã$)B®å)B‰ã$)B«ä)B»˜$)B与ã)B™ã‚‹ãƒ—ãƒ$)B¬ã)Bƒ•ã‚$)B£ã)Bƒƒã‚$)B¯ã)B‚$)B¹ï)B¼Žä¾‹ãˆã° <command>-n c1 -p lxc_</command> ã$)B¨æ)BŒ‡$)Bå®)Bšã™ã‚‹ã$)B¨ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® rootfs ã$)B¯ï)B¼Œ$)Bè«)B–ç†ãƒœãƒ$)Bªã)Bƒ$)B¥ã)Bƒ$)B¼ã)Bƒ å <replaceable>lxc_c1</replaceable> ã$)B¨ã)B„ã†$)Bè«)B–ç†ãƒœãƒ$)Bªã)Bƒ$)B¥ã)Bƒ$)B¼ã)Bƒ $)Bä¸)BŠã$)B«ä)B½œ$)B製ã)B•ã‚Œã‚‹$)Bï¼
+ )Bæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B§å)B…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B¨é)B•ã†ãƒãƒƒã‚$)Bã)Bƒ$)B³ã)B‚$)B°ã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B‚’$)B使ã)B†å $)B´å)Bˆã$)B®ã)Bƒãƒƒã‚$)Bã)Bƒ$)B³ã)B‚$)B°ã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B‚’é$)B¸æ)BŠžã—ã$)B¾ã)B™$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B§ã)B$)B¯å)B…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B¨å)BŒã˜ã‚‚ã$)B®ã)BŒ$)B使ã)B‚ã‚Œã$)B¾ã)B™$)B．ç¾æ)B™‚ç‚$)B¹ã)B$)B§ã)B$)B¯ï)B¼Œãƒãƒƒã‚$)Bã)Bƒ$)B³ã)B‚$)B°ã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B$)B®å)B¤‰æ›$)B´ã)B$)B¯ï)B¼Œãƒ‡ã‚$)B£ã)Bƒ$)B¬ã)B‚$)B¯ã)Bƒˆãƒ$)Bªã)Bƒãƒƒã‚$)B¯ã)B‚$)B¨ã)Bƒ$)B³ã)Bƒ‰ã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å¯¾)Bã™ã‚‹ overlayfs ã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B«å¯¾)Bã—ã$)B¦ã)B$)B®ã)B$)B¿ã)B‚$)Bµã)Bƒãƒ$)B¼ã)Bƒˆã•ã‚Œã$)B¾ã)B™$)B．æ)Bœ‰åŠ$)B¹ã)B$)Bªã)Bƒãƒƒã‚$)Bã)Bƒ$)B³ã)B‚$)B°ã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B¯ dir(directory), btrfs, lvm, zfs, loop, overlayfs ã‚’å$)B«ã)B$)B¿ã)B$)B¾ã)B™$)Bï¼
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
- <option>-t, --fstype <replaceable>fstype</replaceable></option>
+ <option>-o, --orig <replaceable>orig</replaceable></option>
</term>
<listitem>
<para>
<!--
- For a non-snapshot LVM clone, the file system to use for the new
- container. Note this option is ignored when requesting a
- snapshotted container.
+ The name of the original container to clone.
-->
- LVM )Bã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B§ä)B½œ$)B製ã)B—ã$)Bªã)B„ã‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B$)B§ï)B¼Œæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B§ä½¿)Bç”$)B¨ã)B™ã‚‹ãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ $)B．ã)B“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B§ä)B½œ$)B製ã)B™ã‚‹å $)B´å)Bˆã$)B¯ç)B„$)B¡è)B¦–ã•ã‚Œã‚‹$)Bï¼
+ )Bã‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B—ãŸã„å…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)Bå‰$)Bï¼
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>
+ <option>-n, --new <replaceable>new</replaceable></option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ The name of the new container to create.
+ -->
+ ä½)Bœ$)B製ã)B™ã‚‹æ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)Bå‰$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+
+
</variablelist>
</refsect1>
+ <refsect1>
+ <title>Clone hook</title>
+ <para>
+ <!--
+ If the container being cloned has one or more <filename>lxc.hook.clone</filename>
+ specified, then the specified hooks will be called for the new container. The
+ first 3 arguments passed to the clone hook will be the container name, a section
+ ('lxc'), and the hook type ('clone'). Extra arguments passed
+ <command>lxc-clone</command> will be passed to the hook program starting at
+ argument 4. The <filename>LXC_ROOTFS_MOUNT</filename> environment variable gives
+ the path under which the container's root filesystem is mounted. The
+ configuration file pathname is stored in <filename>LXC_CONFIG_FILE</filename>, the
+ new container name in <filename>LXC_NAME</filename>, the old container name in
+ <filename>LXC_SRC_NAME</filename>, and the path or device on which
+ the rootfs is located is in <filename>LXC_ROOTFS_PATH</filename>.
+ -->
+ )Bã‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B•ã‚ŒãŸã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã« 1 ã$)B¤ä»¥ä¸)BŠã® <filename>lxc.hook.clone</filename> ã$)B®æ)BŒ‡$)Bå®)BšãŒ$)Bå)B˜åœ$)B¨ã)B™ã‚‹å $)B´å)Bˆ$)Bï¼)BŒæŒ‡$)Bå®)Bšã•ã‚ŒãŸãƒ•ãƒƒã‚$)B¯ã)B$)B¯æ)B–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å¯¾)Bã—ã$)B¦å)B‘$)B¼ã)B$)B°ã)B‚Œã$)B¾ã)B™$)B．ã)B‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)Bƒ•ãƒƒã‚$)B¯ã)B$)B«æ¸¡)Bã•ã‚Œã‚‹æœ€åˆã® 3 ã$)B¤ã)B$)B®å)B¼•æ•$)B°ã)B$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå$)Bï¼)BŒã‚$)B»ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ³ ('lxc')$)Bï¼)BŒãƒ•ãƒƒã‚$)B¯ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ— ('clone') ã$)B¨ã)B$)Bªã)B‚Šã$)B¾ã)B™$)B．¼command>lxc-clone</command> )Bã$)B«æ¸¡)Bã•ã‚Œã‚‹$)B追å)BŠ ã$)B®å)B¼•æ•$)B°ã)B$)B¯ï)B¼Œãƒ•ãƒƒã‚$)B¯ã)Bƒ—ãƒ$)Bã)B‚$)B°ã)Bƒ$)B©ã)Bƒ ã$)B«æ¸¡)Bã•ã‚Œã‚‹$)Bå¼)B•æ•$)B°ã)B® 4 ç•$)Bªç)B›$)B®ä»¥)Bé™ã$)B¨ã)B$)Bªã)B‚Šã$)B¾ã)B™$)B．¼filename>LXC_ROOTFS_MOUNT</filename> )Bç’$)B°å)B¢ƒ$)Bå¤)B‰æ•$)B°ã)B$)B«ã)B$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® root フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ãŒãƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã•ã‚Œã‚‹ãƒ‘ã‚$)B¹ã)BŒ$)B与ã)Bˆã‚‰ã‚Œã$)B¾ã)B™$)B．è¨å®)Bšãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B®ã)Bƒ‘ã‚$)B¹å)B㯠<filename>LXC_CONFIG_FILE</filename> ã$)B«ï)B¼Œæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå㯠<filename>LXC_NAME</filename>$)Bï¼)BŒå¤ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå㯠<filename>LXC_SRC_NAME</filename> ã$)B«ï)B¼Œrootfs ã$)B®ã)B‚るパã‚$)B¹ã)B$)B¾ã)BŸã$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B¯ <filename>LXC_ROOTFS_PATH</filename> ã$)B«ä)B¿$)Bå)B˜ã•ã‚Œã$)B¾ã)B™$)Bï¼
+ </para>
+ </refsect1>
+
&seealso;
<refsect1>
diff --git a/doc/ja/lxc-console.sgml.in b/doc/ja/lxc-console.sgml.in
index 5fc2728..7bc87be 100644
--- a/doc/ja/lxc-console.sgml.in
+++ b/doc/ja/lxc-console.sgml.in
@@ -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>
@@ -94,6 +94,15 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<para>
<!--
+ A <replaceable>ttynum</replaceable> of 0 may be given to attach
+ to the container's /dev/console instead of its
+ dev/tty<<replaceable>ttynum</replaceable>>.
+ -->
+ <replaceable>ttynum</replaceable> )Bã‚’ 0 ã$)B«è¨å®)Bšã™ã‚‹ã$)B¨ï)B¼Œdev/tty<<replaceable>ttynum</replaceable>>ã$)B®ä»£)Bã‚ã‚Šã$)B«ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® /dev/console ã$)B«æŽ¥ç¶)Bšã—ã$)B¾ã)B™$)B．ò
+ </para>
+
+ <para>
+ <!--
A keyboard escape sequence may be used to disconnect from the tty
and quit lxc-console. The default escape sequence is <Ctrl+a q>.
-->
@@ -129,10 +138,11 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<listitem>
<para>
<!--
- Specify the tty number to connect, if not specified a tty
- number will be automatically choosen by the container.
+ Specify the tty number to connect to or 0 for the console. If not
+ specified the next available tty number will be automatically
+ choosen by the container.
-->
- )B接$)Bç¶)Bšã™ã‚‹ tty ã$)B®ç)B•$)Bªå·ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．æ)BŒ‡$)Bå®)Bšã—ã$)Bªã)B„å $)B´å)Bˆã$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒè‡$)Bªå)B‹•çš„ã« tty ç•$)Bªå·ã)B‚’é$)B¸æ)BŠžã—ã$)B¾ã)B™$)B．í
+ )B接$)Bç¶)Bšã™ã‚‹ tty ã$)B®ç)B•$)Bªå·ã)B‹$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)B‚$)B½ã)Bƒ$)B¼ã)Bƒ$)B«ã)B$)B«æŽ¥ç¶)Bšã™ã‚‹ãŸã‚ã« 0 を指$)Bå®)Bšã—ã$)B¾ã)B™$)B．æ)BŒ‡$)Bå®)Bšã—ã$)Bªã)B„å $)B´å)Bˆã$)B¯ï)B¼Œ$)B次ã)B$)B«å)Bˆ$)B©ç)B”$)B¨å¯è)Bƒ$)B½ã)Bª tty ç•$)Bªå·ã)B‚’è‡$)Bªå)B‹•çš„ã$)B«ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒé$)B¸æ)BŠžã—ã$)B¾ã)B™$)Bï¼
</para>
</listitem>
</varlistentry>
diff --git a/doc/ja/lxc-create.sgml.in b/doc/ja/lxc-create.sgml.in
index 275203a..729b15a 100644
--- a/doc/ja/lxc-create.sgml.in
+++ b/doc/ja/lxc-create.sgml.in
@@ -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>
@@ -150,16 +150,18 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<listitem>
<para>
<!--
- 'backingstore' is one of 'none', 'dir', 'lvm', or 'btrfs'. The
+ 'backingstore' is one of 'none', 'dir', 'lvm', 'loop', or 'btrfs'. The
default is 'none', meaning that the container root filesystem
will be a directory under <filename>@LXCPATH@/container/rootfs</filename>.
'dir' has the same meaning as 'none', but also allows the optional
<replaceable>--dir ROOTFS</replaceable> to be specified, meaning
that the container rootfs should be placed under the specified path,
- rather than the default.
- The option 'btrfs' need not be specified as it will be used
- automatically if the <filename>@LXCPATH@</filename> filesystem is found to
- be btrfs. If backingstore is 'lvm', then an lvm block device will be
+ rather than the default. If 'btrfs' is specified, then the
+ target filesystem must be btrfs, and the container rootfs will be
+ created as a new subvolume. This allows snapshotted clones to be
+ created, but also causes rsync --one-filesystem to treat it as a
+ separate filesystem.
+ If backingstore is 'lvm', then an lvm block device will be
used and the following further options are available:
<replaceable>--lvname lvname1</replaceable> will create an LV
named <filename>lvname1</filename> rather than the default, which
@@ -172,8 +174,8 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
filesystem) of size SIZE rather than the default, which is 1G.
-->
<replaceable>backingstore</replaceable> )Bã$)B«ã)B¯ 'none' ã‹ 'dir' ã‹ 'lvm' ã‹ 'btrfs' ã$)B®ã)B„ãšã‚Œã‹ã‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã¯ 'none' ã$)B§ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ$)B«ã)Bƒ$)B¼ã)Bƒˆãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ㌠<filename>@LXCPATH@/container/rootfs</filename> $)B以ä)B¸‹ã$)B®ã)Bƒ‡ã‚$)B£ã)Bƒ$)B¬ã)B‚$)B¯ã)Bƒˆãƒ$)Bªã)B$)B§ã)B‚ã‚‹ã“ã$)B¨ã)B‚’æ„å‘$)B³ã)B—ã$)B¾ã)B™$)Bï¼
-'dir' )B㯠'none' ã$)B¨å)BŒã˜æ„å‘$)B³ã)B$)B§ã)B™ãŒ$)Bï¼)BŒã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¨ã)B—㦠<replaceable>--dir ROOTFS</replaceable> を指$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)B‚‚å¯èƒ$)B½ã)B$)B§ã)B™$)B．ã)B“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ï)B¼Œãƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B®ä»£)Bã‚ã‚Šã$)B«ç)B‰$)B¹å)B®šã$)B®ã)Bƒ‘ã‚$)B¹ä»¥ä¸)B‹ã$)B«ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® rootfs ã‚’$)Bç½®ã)Bã$)B¨ã)B„ã†ã“ã$)B¨ã)B$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™$)Bï¼
- 'btrfs' )Bã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ï)B¼Œã‚‚ã— <filename>@LXCPATH@</filename> ã$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ㌠btrfs ã$)B§ã)B‚ã‚‹ã“ã$)B¨ã)BŒã‚ã‹ã‚Œã$)B°ï)B¼Œè‡$)Bªå)B‹•çš„ã$)B«ã)B“ã$)B®å)B€$)B¤ã)BŒ$)B使ã)B‚ã‚Œã$)B¾ã)B™ã$)B®ã)B$)B§æ)BŒ‡$)Bå®)Bšã™ã‚‹$)Bå¿)B…$)Bè¦)Bã$)B¯ã)B‚ã‚Šã$)B¾ã)B›ã‚“$)B．ã)B‚‚ã— backingstore ㌠'lvm' ã$)B§ã)B‚ã‚‹å $)B´å)Bˆ$)Bï¼)BŒlvm ブãƒ$)Bã)Bƒƒã‚$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B‚’$)B使ç)B”$)B¨ã)B—ã$)B¾ã)B™$)B．ã)B“ã$)B®æ)B™‚$)Bï¼)BŒ$)B以ä)B¸‹ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)BŒæœ‰åŠ$)B¹ã)B$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™: <replaceable>--lvname lvname1</replaceable> ã$)B¯ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆå€$)B¤ã)B$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠåã® LV ã$)B®ä»£)Bã‚ã‚Šã« <filename>lvname1</filename> ã$)B¨ã)B„ã†åå‰ã® LV ã‚’$)Bä½)Bœæˆã—ã$)B¾ã)B™$)B．¼replaceable>--vgname vgname1</replaceable> )Bã$)B¯ï)B¼Œãƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆå€$)B¤ã)B$)B§ã)B‚ã‚‹ <filename>lxc</filename> ã$)B¨ã)B„ㆠvolume group ã$)B®ä»£)Bã‚ã‚Šã« <filename>vgname1</filename> ã$)B¨ã)B„ã†åå‰ã® volume group 内㫠LV ã‚’$)Bä½)Bœæˆã—ã$)B¾ã)B™$)B．¼replaceable>--fstype FSTYPE</replaceable> )B㯠LV $)Bä¸)BŠã$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ をデフã‚$)B©ã)Bƒ$)B«ã)Bƒˆå€$)B¤ã)B$)B§ã)B‚ã‚‹ ext4 ã$)B®ä»£)Bã‚ã‚Šã« FSTYPE ã$)B§æ)BŒ‡$)Bå®)Bšã—ãŸã‚‚ã$)B®ã)B$)B§ä)B½œæˆã—ã$)B¾ã)B™$)B．¼replaceable>--fssize SIZE</replaceable> )Bã$)B¯ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆå€$)B¤ã)B$)B§ã)B‚ã‚‹ 1G ã$)B®ä»£)Bã‚ã‚Šã« SIZE ã$)B§æ)BŒ‡$)Bå®)Bšã—ãŸã‚$)Bµã)B‚$)B¤ã)B‚$)Bºã)B§ LV ã‚’$)Bä½)Bœæˆã—ã$)B¾ã)B™$)Bï¼
+'dir' )B㯠'none' ã$)B¨å)BŒã˜æ„å‘$)B³ã)B$)B§ã)B™ãŒ$)Bï¼)BŒã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¨ã)B—㦠<replaceable>--dir ROOTFS</replaceable> を指$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)B‚‚å¯èƒ$)B½ã)B$)B§ã)B™$)B．ã)B“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ï)B¼Œãƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B®ä»£)Bã‚ã‚Šã$)B«ç)B‰$)B¹å)B®šã$)B®ã)Bƒ‘ã‚$)B¹ä»¥ä¸)B‹ã$)B«ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® rootfs ã‚’$)Bç½®ã)Bã$)B¨ã)B„ã†ã“ã$)B¨ã)B$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™$)B．§btrfs' )BãŒæŒ‡$)Bå®)Bšã•ã‚ŒãŸå $)B´å)Bˆ$)Bï¼)BŒã‚$)B¿ã)Bƒ$)B¼ã)B‚$)B²ã)Bƒƒãƒˆã$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ 㯠btrfs ã$)B§ã)B$)Bªã)B‘ã‚Œã$)B°ã)B„ã‘ã$)B¾ã)B›ã‚“$)B．ã)Bã—ã$)B¦ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® rootfs ã$)B¯æ)B–$)B°ã)B—ã„ subvolume ã$)B¨ã)B—ã$)B¦ä)B½œ$)B製ã)B•ã‚Œã$)B¾ã)B™$)B．ã)B“ã$)B®ã)B“ã$)B¨ã)B$)B«ã)B‚ˆã‚Š$)Bï¼)BŒã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B«ã)B‚ˆã‚‹ã‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)BŒ$)Bä½)Bœ$)B製å¯è)Bƒ$)B½ã)B$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™ãŒ$)Bï¼)BŒrsync --one-filesystem ãŒ$)Bï¼)BŒåˆ$)B¥ã)B€…ã$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã$)B¨ã)B—ã$)B¦å)B–ã‚Šæ‰$)B±ã)B$)B£ã)B$)B¦ã)B—ã$)B¾ã)B†ã“ã$)B¨ã)B‚‚$)Bå¼)B•ã$)Bèµ·ã)B“ã—ã$)B¾ã)B™$)Bï¼
+backingstore )B㌠'lvm' ã$)B§ã)B‚ã‚‹å $)B´å)Bˆ$)Bï¼)BŒlvm ブãƒ$)Bã)Bƒƒã‚$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B‚’$)B使ç)B”$)B¨ã)B—ã$)B¾ã)B™$)B．ã)B“ã$)B®æ)B™‚$)Bï¼)BŒ$)B以ä)B¸‹ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)BŒæœ‰åŠ$)B¹ã)B$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™: <replaceable>--lvname lvname1</replaceable> ã$)B¯ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆå€$)B¤ã)B$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠåã® LV ã$)B®ä»£)Bã‚ã‚Šã« <filename>lvname1</filename> ã$)B¨ã)B„ã†åå‰ã® LV ã‚’$)Bä½)Bœæˆã—ã$)B¾ã)B™$)B．¼replaceable>--vgname vgname1</replaceable> )Bã$)B¯ï)B¼Œãƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆå€$)B¤ã)B$)B§ã)B‚ã‚‹ <filename>lxc</filename> ã$)B¨ã)B„ㆠvolume group ã$)B®ä»£)Bã‚ã‚Šã« <filename>vgname1</filename> ã$)B¨ã)B„ã†åå‰ã® volume group 内㫠LV ã‚’$)Bä½)Bœæˆã—ã$)B¾ã)B™$)B．¼replaceable>--fstype FSTYPE</replaceable> )B㯠LV $)Bä¸)BŠã$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ をデフã‚$)B©ã)Bƒ$)B«ã)Bƒˆå€$)B¤ã)B$)B§ã)B‚ã‚‹ ext4 ã$)B®ä»£)Bã‚ã‚Šã« FSTYPE ã$)B§æ)BŒ‡$)Bå®)Bšã—ãŸã‚‚ã$)B®ã)B$)B§ä)B½œæˆã—ã$)B¾ã)B™$)B．¼replaceable>--fssize SIZE</replaceable> )Bã$)B¯ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆå€$)B¤ã)B$)B§ã)B‚ã‚‹ 1G ã$)B®ä»£)Bã‚ã‚Šã« SIZE ã$)B§æ)BŒ‡$)Bå®)Bšã—ãŸã‚$)Bµã)B‚$)B¤ã)B‚$)Bºã)B§ LV ã‚’$)Bä½)Bœæˆã—ã$)B¾ã)B™$)B．ó
</para>
</listitem>
</varlistentry>
diff --git a/doc/ja/lxc-destroy.sgml.in b/doc/ja/lxc-destroy.sgml.in
index a962708..dbd0ae6 100644
--- a/doc/ja/lxc-destroy.sgml.in
+++ b/doc/ja/lxc-destroy.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-device.sgml.in b/doc/ja/lxc-device.sgml.in
index d982370..7a944a8 100644
--- a/doc/ja/lxc-device.sgml.in
+++ b/doc/ja/lxc-device.sgml.in
@@ -1,3 +1,4 @@
+
<!--
(C) Copyright Canonical Ltd. 2013
@@ -17,7 +18,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>
@@ -43,7 +44,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<refpurpose>
<!--
- manage deices of running containers
+ manage devices of running containers
-->
å®)BŸ$)Bè¡)BŒ$)Bä¸ã)B$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B‚’$)B管ç)B†ã™ã‚‹
</refpurpose>
diff --git a/doc/ja/lxc-execute.sgml.in b/doc/ja/lxc-execute.sgml.in
index 50826d8..975ee70 100644
--- a/doc/ja/lxc-execute.sgml.in
+++ b/doc/ja/lxc-execute.sgml.in
@@ -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>
@@ -163,17 +163,17 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
Signal the end of options and disables further option
processing. Any arguments after the -- are treated as
- arguments.
+ arguments to <replaceable>command</replaceable>.
-->
- )Bã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³æ)BŒ‡$)Bå®)Bšã$)B®æ)Bœ€$)Bå¾)BŒã$)B®å)B$)B°ã)B$)B§ï)B¼Œãã‚Œ$)B以ä)B¸Šã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B®å)B‡$)B¦ç)B†ã‚’$)Bæ¢ã)B‚ã$)B¾ã)B™$)B．- )Bã$)B®å)B¾Œã$)B®å)B¼•æ•$)B°ã)B$)B¯å)B®Ÿ$)Bè¡)BŒã™ã‚‹ã‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ã$)B¨ã)Bã$)B®å)B¼•æ•$)B°ã)B$)B¨ã)B—ã$)B¦æ)B‰$)B±ã)B‚ã‚Œã$)B¾ã)B™$)Bï¼
+ )Bã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³æ)BŒ‡$)Bå®)Bšã$)B®æ)Bœ€$)Bå¾)BŒã$)B®å)B$)B°ã)B$)B§ï)B¼Œãã‚Œ$)B以ä)B¸Šã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B®å)B‡$)B¦ç)B†ã‚’$)Bæ¢ã)B‚ã$)B¾ã)B™$)B．- )Bã$)B®å)B¾Œã$)B®å)B¼•æ•$)B°ã)B$)B¯å)B®Ÿ$)Bè¡)BŒã™ã‚‹ <replaceable>command</replaceable> ã$)B®å)B¼•æ•$)B°ã)B$)B¨ã)B—ã$)B¦æ)B‰$)B±ã)B‚ã‚Œã$)B¾ã)B™$)B．ð
</para>
<para>
<!--
- This option is useful when you want to execute, with the
- command <command>lxc-execute</command>, a command line
- with its own options.
+ This option is useful when you want specify options
+ to <replaceable>command</replaceable> and don't want
+ <command>lxc-execute</command> to interpret them.
-->
- )Bã“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ï)B¼Œ<command>lxc-execute</command> ã$)B§å)B®Ÿ$)Bè¡)BŒã™ã‚‹ã‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ãŒ$)Bï¼)BŒã‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ãƒ$)B©ã)B‚$)B¤ã)Bƒ$)B³ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B‚’æŒã$)B¤å)B $)B´å)Bˆã$)B«å½¹)Bã$)B«ç)B«‹ã$)B¡ã)B$)B¾ã)B™$)Bï¼
+ )Bã“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ï)B¼Œ<replaceable>command</replaceable> ã$)B«ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B‚’指$)Bå®)Bšã—ãŸã„ã$)B¨ã)Bã$)B«ï)B¼Œ<command>lxc-execute</command> ãŒãã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B‚’$)Bèªã)B$)B¿å)B–ã$)B£ã)B$)B¦ã)B$)B»ã)B—ãã$)Bªã)B„ã$)B¨ã)Bã$)B«å½¹)Bã$)B«ç)B«‹ã$)B¡ã)B$)B¾ã)B™$)B．á
</para>
</listitem>
</varlistentry>
diff --git a/doc/ja/lxc-freeze.sgml.in b/doc/ja/lxc-freeze.sgml.in
index f651102..cf54868 100644
--- a/doc/ja/lxc-freeze.sgml.in
+++ b/doc/ja/lxc-freeze.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-info.sgml.in b/doc/ja/lxc-info.sgml.in
index bd2b559..5eaaf21 100644
--- a/doc/ja/lxc-info.sgml.in
+++ b/doc/ja/lxc-info.sgml.in
@@ -17,7 +17,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>
@@ -54,9 +54,10 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<cmdsynopsis>
<command>lxc-info</command>
<arg choice="req">-n <replaceable>name</replaceable></arg>
- <arg choice="req">-s</arg>
- <arg choice="req">-p</arg>
- <arg choice="req">-t <replaceable>state</replaceable></arg>
+ <arg choice="opt">-c <replaceable>KEY</replaceable></arg>
+ <arg choice="opt">-s</arg>
+ <arg choice="opt">-p</arg>
+ <arg choice="opt">-t <replaceable>state</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -91,6 +92,21 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<varlistentry>
<term>
+ <option><optional>-c <replaceable>KEY</replaceable></optional></option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Print a configuration key from the running container. This option
+ may be given mulitple times to print out multiple key = value pairs.
+ -->
+ å®)BŸ$)Bè¡)BŒ$)Bä¸ã)B$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®è¨å®)Bšå€$)B¤ã)B‚’$)B表示)Bã—ã$)B¾ã)B™$)B．ã)B“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯è)B¤‡æ•$)B°ã)B® key = value ã$)B®ã)Bƒšã‚$)B¢ã)B‚’$)B表示)Bã—ãŸã„å $)B´å)Bˆã$)B«ã)B$)B¯è)B¤‡æ•$)B°å)B›žæŒ‡$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)B‚‚å¯èƒ$)B½ã)B$)B§ã)B™$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
<option><optional>-s</optional></option>
</term>
<listitem>
@@ -157,7 +173,19 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
exits 0 if foo is RUNNING, 1 otherwise.
-->
- )Bã‚‚ã—ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠ foo ㌠RUNNING ã$)B§ã)B‚れ㰠0 ã‚’$)Bè¿)B”ã™$)B．ã)Bã‚Œ$)B以å)B¤–㯠1 ã‚’$)Bè¿)B”ã™$)Bï¼)BŠ
+ )Bã‚‚ã—ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠ foo ㌠RUNNING ã$)B§ã)B‚れ㰠0 ã‚’$)Bè¿)B”ã—ã$)B¾ã)B™$)B．ã)Bã‚Œ$)B以å)B¤–㯠1 ã‚’$)Bè¿)B”ã—ã$)B¾ã)B™$)Bï¼)B
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>lxc-info -n foo -c lxc.network.0.veth.pair</term>
+ <listitem>
+ <para>
+ <!--
+ prints the veth pair name of foo.
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠ foo ã® veth pair ã‚’$)B表示)Bã—ã$)B¾ã)B™$)B．¾
</para>
</listitem>
</varlistentry>
diff --git a/doc/ja/lxc-kill.sgml.in b/doc/ja/lxc-kill.sgml.in
index 7e5d242..02d153b 100644
--- a/doc/ja/lxc-kill.sgml.in
+++ b/doc/ja/lxc-kill.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-ls.sgml.in b/doc/ja/lxc-ls.sgml.in
index ae1a3b2..95e3ab3 100644
--- a/doc/ja/lxc-ls.sgml.in
+++ b/doc/ja/lxc-ls.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-monitor.sgml.in b/doc/ja/lxc-monitor.sgml.in
index d97769e..ce27cf7 100644
--- a/doc/ja/lxc-monitor.sgml.in
+++ b/doc/ja/lxc-monitor.sgml.in
@@ -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>
@@ -72,25 +72,20 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<command>lxc-monitor</command> )Bã$)B¯æ)BŒ‡$)Bå®)Bšã•ã‚ŒãŸã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ç)BŠ$)B¶æ)B…‹ã‚’ãƒ$)B¢ã)Bƒ‹ã‚$)B¿ã)B—ã$)B¾ã)B™$)B．¼replaceable>name</replaceable> )B㯠posix2 $)Bæº)B–æ‹ ã$)B®æ£è¦è¡¨ç¾ã)BŒ$)B使ç)B”$)B¨å¯è)Bƒ$)B½ã)B$)B§ã)B™ã$)B®ã)B$)B§ï)B¼Œå…$)B¨ã)B$)B¦ã)B$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠ$)Bï¼)BŒã„ãã$)B¤ã)B‹ã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠ$)Bï¼)BŒ$)Bä¸)B€ã$)B¤ã)B ã‘ã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã‚’ãƒ$)B¢ã)Bƒ‹ã‚$)B¿ã)Bƒ$)Bªã)Bƒ$)B³ã)B‚$)B°ã)B™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．Á
</para>
- </refsect1>
-
- &commonoptions;
-
- <refsect1>
- <title><!-- Bugs -->)Bãƒã‚°</title>
-
<para>
<!--
- Only one <command>lxc-monitor</command> can run at a time. Other
- invocations will fail with the following error:
+ The <option>-P, --lxcpath</option>=PATH option may be specified multiple
+ times to monitor more than one container path. Note however that
+ containers with the same name in multiple paths will be
+ indistinguishable in the output.
-->
- ä¸)B€$)B度ã)B$)B«ä)B¸€ã$)B¤ã)B® <command>lxc-monitor</command> ã—ã‹$)Bå®)BŸ$)Bè¡)BŒã$)B§ã)Bã$)B¾ã)B›ã‚“$)B．ã)Bã‚Œ$)B以ä)B¸Š$)Bèµ·å)B‹•ã—よã†ã$)B¨ã)B™ã‚‹ã$)B¨ï)B¼Œ$)B以ä)B¸‹ã$)B®ã)B‚ˆã†ã$)Bªã)B‚$)B¨ã)Bƒ$)B©ã)Bƒ$)B¼ã)B$)B§å¤±)Bæ•—ã—ã$)B¾ã)B™$)B．Í
- </para>
- <para>
- lxc-monitor: bind : Address already in use
+ 1 )Bã$)B¤ä»¥ä¸)BŠã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãƒ‘ã‚$)B¹ã)B‚’ãƒ$)B¢ã)Bƒ‹ã‚$)B¿ã)Bƒ$)Bªã)Bƒ$)B³ã)B‚$)B°ã)B™ã‚‹ãŸã‚ã$)B«ï)B¼Œ$)Bè¤)B‡æ•$)B°å)B›žã® <option>-P, --lxcpath</option>=PATH ã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B‚’指$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．ã)B—ã‹ã—$)Bï¼)BŒ$)Bè¤)B‡æ•$)B°ã)B$)B®ã)Bƒ‘ã‚$)B¹ã)B$)B§å)BŒã˜åå‰ã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)B $)B´å)Bˆã$)B¯ï)B¼Œå‡$)Bºå)BŠ›ã$)B®è)B¦‹åˆ†ã‘ãŒã$)B¤ã)B‹ã$)Bªã)B„$)Bäº)B‹ã$)B«æ³¨)Bæ„ãŒ$)Bå¿)B…$)Bè¦)Bã$)B§ã)B™$)B．¹
</para>
</refsect1>
+
+ &commonoptions;
+
<refsect1>
<title>Examples</title>
<variablelist>
diff --git a/doc/ja/lxc-netstat.sgml.in b/doc/ja/lxc-netstat.sgml.in
index ea542e8..7ab136f 100644
--- a/doc/ja/lxc-netstat.sgml.in
+++ b/doc/ja/lxc-netstat.sgml.in
@@ -17,7 +17,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>
diff --git a/doc/ja/lxc-ps.sgml.in b/doc/ja/lxc-ps.sgml.in
index 1717cdd..5a0f96d 100644
--- a/doc/ja/lxc-ps.sgml.in
+++ b/doc/ja/lxc-ps.sgml.in
@@ -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>
@@ -57,7 +57,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<arg choice="opt">--name <replaceable>name</replaceable></arg>
<arg choice="opt">--lxc</arg>
<arg choice="opt">--host</arg>
- <arg choice="opt">-- ps option</arg>
+ <arg choice="opt">-- <replaceable>ps options</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -81,12 +81,12 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</para>
<para>
<!--
- The additionnal specified ps options must not
+ The additional specified <replaceable>ps options</replaceable> must not
remove the default ps header and the pid information,
to be able to have the <command>lxc-ps</command> to find
the container associated to processes.
-->
- <command>lxc-ps</command> )BãŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«é)B–$)B¢é)B€$)B£ã)B—ãŸãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B‚’$)Bè¦)B‹ã$)B¤ã)B‘ã‚‹ãŸã‚ã$)B«ã)B$)B¯ï)B¼Œ$)B追å)BŠ ã$)B§æ)BŒ‡$)Bå®)Bšã•ã‚ŒãŸ ps ã‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)BŒ$)Bï¼)BŒ$)Bæ¨)B™$)Bæº)B–ã® ps ã‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ã$)B®ã)Bƒ˜ãƒƒãƒ€ã‚„ pid 情å $)B±ã)B‚’削é™$)B¤ã)B—ã$)B¦ã)B$)B¯ã)B„ã‘ã$)B¾ã)B›ã‚“$)B．ô
+ <command>lxc-ps</command> )BãŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«é)B–$)B¢é)B€$)B£ã)B—ãŸãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B‚’$)Bè¦)B‹ã$)B¤ã)B‘ã‚‹ãŸã‚ã$)B«ã)B$)B¯ï)B¼Œ$)B追å)BŠ ã$)B§æ)BŒ‡$)Bå®)Bšã•ã‚ŒãŸ <replaceable>ps options</replaceable> ãŒ$)Bï¼)BŒ$)Bæ¨)B™$)Bæº)B–ã® ps ã‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ã$)B®ã)Bƒ˜ãƒƒãƒ€ã‚„ pid 情å $)B±ã)B‚’削é™$)B¤ã)B—ã$)B¦ã)B$)B¯ã)B„ã‘ã$)B¾ã)B›ã‚“$)B．å
</para>
</refsect1>
@@ -105,7 +105,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
to limit the output to the processes belonging
to this container name.
-->
- <replaceable>name</replaceable> )Bã$)B§æ)BŒ‡$)Bå®)Bšã—ãŸã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å)B±žã™ã‚‹ãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B$)B®ã)B$)B¿å)B‡$)Bºå)BŠ›ã™ã‚‹$)B．ã
+ <replaceable>name</replaceable> )Bã$)B§æ)BŒ‡$)Bå®)Bšã—ãŸã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å)B±žã™ã‚‹ãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B$)B®ã)B$)B¿å)B‡$)Bºå)BŠ›ã—ã$)B¾ã)B™$)Bï¼)B™
</para>
</listitem>
</varlistentry>
@@ -120,7 +120,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
limit the output to the processes belonging
to all lxc containers.
-->
- )Bå…$)B¨ã)B$)B¦ã)B® lxc ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å)B±žã™ã‚‹ãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B‚’å‡$)Bºå)BŠ›ã™ã‚‹$)Bï¼)B‚
+ )Bå…$)B¨ã)B$)B¦ã)B® lxc ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å)B±žã™ã‚‹ãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B‚’å‡$)Bºå)BŠ›ã—ã$)B¾ã)B™$)B．¾
</para>
</listitem>
</varlistentry>
@@ -135,14 +135,14 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
limit the output to the processes belonging
to the host.
-->
- )Bホã‚$)B¹ã)Bƒˆ ($)B訳注: )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠ$)B以å)B¤–) ã$)B«å)B±žã™ã‚‹ãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B$)B®ã)B$)B¿ã)B‚’å‡$)Bºå)BŠ›ã™ã‚‹$)B．
+ )Bホã‚$)B¹ã)Bƒˆ ($)B訳注: )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠ$)B以å)B¤–) ã$)B«å)B±žã™ã‚‹ãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B$)B®ã)B$)B¿ã)B‚’å‡$)Bºå)BŠ›ã—ã$)B¾ã)B™$)Bï¼
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
- <option><optional>ps options</optional></option>
+ <option><optional><replaceable>ps options</replaceable></optional></option>
</term>
<listitem>
<para>
diff --git a/doc/ja/lxc-restart.sgml.in b/doc/ja/lxc-restart.sgml.in
index 23aec56..73396ff 100644
--- a/doc/ja/lxc-restart.sgml.in
+++ b/doc/ja/lxc-restart.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-shutdown.sgml.in b/doc/ja/lxc-shutdown.sgml.in
deleted file mode 100644
index 4334006..0000000
--- a/doc/ja/lxc-shutdown.sgml.in
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--
-
-Copyright (C) 2012 Canonical, Inc
-
-Authors: Serge Hallyn <serge.hallyn at canonical.com>
-
-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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-shutdown</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
-
- <refnamediv>
- <refname>lxc-shutdown</refname>
-
- <refpurpose>
- <!--
- externally shut down or reboot a container
- -->
- )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠ$)Bå¤)B–éƒ$)B¨ã)B‹ã‚‰ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)B$)B¾ã)BŸã$)B¯ã)Bƒ$)Bªã)Bƒ–ãƒ$)B¼ã)Bƒˆã‚’$)Bè¡)BŒã†
- </refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>lxc-shutdown</command>
- <arg choice="req">-n <replaceable>name</replaceable></arg>
- <arg choice="opt">-w</arg>
- <arg choice="opt">-r</arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title><!-- Description -->説æ)B˜Ž¼/title>
-
- <para>
- <!--
- <command>lxc-shutdown</command> sends a SIGPWR signal to the
- specified container to request it to cleanly shut down. If
- <optional>-w</optional> is specified, then <command>lxc-shutdown</command>
- will wait until the container has shut down before exiting.
- If <optional>-r</optional> is specified, the container will be
- asked to reboot (using a SIGINT signal), and <optional>-w</optional>
- will be ignored. If the container ignore these signals, then
- nothing will happen. In that case, you can use <command>lxc-stop</command>
- to force the container to stop.
- -->
- <command>lxc-shutdown</command> )Bã$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã‚’ã‚$)B¯ã)Bƒ$)Bªã)Bƒ$)B¼ã)Bƒ$)B³ã)B$)B«ã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)B™ã‚‹$)Bè¦)B$)Bæ±)B‚ã‚’ã™ã‚‹ãŸã‚ã« SIGPWR ã‚$)B·ã)B‚$)B°ã)BƒŠãƒ$)B«ã)B‚’指$)Bå®)Bšã—ãŸã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«é)B€ã‚Šã$)B¾ã)B™$)B．ã)B‚‚ã— <optional>-w</optional> ã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)BŒæŒ‡$)Bå®)Bšã•ã‚ŒãŸå $)B´å)Bˆ$)Bï¼)BŒ<command>lxc-shutdown</command> ã$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒã‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)B™ã‚‹ã$)B¾ã)B$)B§è)B‡$)Bªèº«)BãŒ$)Bçµ)B‚$)Bäº)B†ã™ã‚‹ã$)B®ã)B‚’$)Bå¾)B…ã$)B¡ã)B$)B¾ã)B™$)B．ã)B‚‚ã— <optional>-r</optional> ãŒæŒ‡$)Bå®)Bšã•ã‚ŒãŸå $)B´å)Bˆ$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã« (SIGINT ã‚$)B·ã)B‚$)B°ã)BƒŠãƒ$)B«ã)B‚’$)B使ã)B$)B£ã)B¦) å†$)Bèµ·å)B‹•ã‚’$)Bè¦)B$)Bæ±)B‚ã—ã$)B¾ã)B™$)B．ã)Bã—ã$)B¦ï)B¼Œã“ã$)B®æ)B™‚ <optional>-w</optional> ã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ç)B„$)B¡è)B¦–ã•ã‚Œã$)B¾ã)B™$)B．ã)B‚‚ã—ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒã“ã® 2 ã$)B¤ã)B$)B®ã)B‚$)B·ã)B‚$)B°ã)BƒŠãƒ$)B«ã)B‚’ç„$)B¡è)B¦–ã—ãŸå $)B´å)Bˆã$)B¯ä)B½•ã‚‚$)Bèµ·ã)Bã$)B¾ã)B›ã‚“$)B．ã)B“ã$)B®å)B $)B´å)Bˆã$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã‚’$)Bå¼·å)Bˆ$)B¶ç)Bš„ã$)B«å)Bœ$)Bæ¢ã)B™ã‚‹ãŸã‚ã« <command>lxc-stop</command> ã‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ãŒ$)B使ã)Bˆã$)B¾ã)B™$)B．å
- </para>
-
- </refsect1>
-
- &commonoptions;
-
- &seealso;
-
- <refsect1>
- <title><!-- Author -->ä½)Bœè€…</title>
- <para>Serge Hallyn <email>serge.hallyn at canonical.com</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-snapshot.sgml.in b/doc/ja/lxc-snapshot.sgml.in
new file mode 100644
index 0000000..b643277
--- /dev/null
+++ b/doc/ja/lxc-snapshot.sgml.in
@@ -0,0 +1,188 @@
+<!--
+
+lxc: linux Container library
+
+(C) Copyright Canonical Inc. 2007, 2008
+
+Authors:
+Serge Hallyn <serge.hallyn at ubuntu.com>
+
+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-snapshot</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>lxc-snapshot</refname>
+
+ <refpurpose>
+ <!--
+ Snapshot an existing container.
+ -->
+ )Bæ—$)B¢å)B˜ã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã‚’å–$)Bå¾)B—ã™ã‚‹
+ </refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>lxc-snapshot</command>
+ <arg choice="req">-n, --name <replaceable>name</replaceable></arg>
+ <arg choice="opt">-c, --comment <replaceable>file</replaceable></arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>lxc-snapshot</command>
+ <arg choice="req">-n, --name <replaceable>name</replaceable></arg>
+ <arg choice="req">-L, --list </arg>
+ <arg choice="opt">-C, --showcomments </arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>lxc-snapshot</command>
+ <arg choice="req">-n, --name <replaceable>name</replaceable></arg>
+ <arg choice="req">-r, -restore <replaceable>snapshot-name</replaceable></arg>
+ <arg choice="opt"> <replaceable> newname</replaceable></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title><!-- Description -->説æ)B˜Ž¼/title>
+
+ <para>
+ <!--
+ <command>lxc-snapshot</command> creates, lists, and restores
+ container snapshots.
+ -->
+ <command>lxc-snapshot</command> )Bã$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B®ä)B½œ$)B製ï)B¼Œã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B®ã)Bƒ$)Bªã)B‚$)B¹ã)Bƒˆ$)B表示ï¼)BŒã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã‹ã‚‰ã$)B®ã)Bƒ$)Bªã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B‚’$)Bè¡)BŒã„ã$)B¾ã)B™$)Bï¼)Bœ
+ </para>
+ <para>
+ <!--
+ 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>.
+ -->
+ )Bã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B¯ï)B¼Œ$)Bå°)B‚ç”$)B¨ã)B$)B®è¨å®)Bšã•ã‚ŒãŸãƒ‘ã‚$)B¹ä»¥ä¸)B‹ã$)B«ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)BƒƒãƒˆåŒ–ã•ã‚ŒãŸã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B¨ã)B—ã$)B¦ä)B¿$)Bå)B˜ã•ã‚Œã$)B¾ã)B™$)B．ä)B¾‹ãˆã$)B°ï)B¼Œã‚‚ã—ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãƒ‘ã‚$)B¹ã)BŒ <filename>/var/lib/lxc</filename> ã$)B§ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ <filename>c1</filename> ã$)B§ã)B‚ã‚‹å $)B´å)Bˆ$)Bï¼)BŒæœ€åˆã$)B«å)B–$)Bå¾)B—ã™ã‚‹ã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B¯ï)B¼Œãƒ‘ス <filename>/var/lib/lxcsnaps/c1</filename> ã$)B®ä)B¸‹ã® <filename>snap0</filename> ã$)B¨ã)B—ã$)B¦ä)B¿$)Bå)B˜ã•ã‚Œã$)B¾ã)B™$)Bï¼
+ </para>
+ </refsect1>
+
+ <refsect1>
+
+ <title><!-- Options -->)Bã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ³</title>
+
+ <variablelist>
+
+ <varlistentry>
+ <term> <option>-c,--comment <replaceable>comment_file</replaceable></option> </term>
+ <listitem>
+ <para>
+ <!--
+ Associate the comment in <replaceable>comment_file</replaceable> with the newly created snapshot.
+ -->
+ )Bæ–$)B°ã)B—ã作$)B製ã)B™ã‚‹ã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã« <replaceable>comment_file</replaceable> フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«å)B†…ã$)B®ã)B‚$)B³ã)Bƒ$)B¡ã)Bƒ$)B³ã)Bƒˆã‚’é–$)B¢é)B€$)B£ä)B»˜ã‘ã‚‹$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term> <option>-L,--list </option> </term>
+ <listitem>
+ <para>
+ <!--
+ List existing snapshots.
+ -->
+ å)B˜åœ$)B¨ã)B™ã‚‹ã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã‚’ãƒ$)Bªã)B‚$)B¹ã)Bƒˆ$)B表示)Bã™ã‚‹$)Bï¼)Bˆ
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term> <option>-C,--showcomments </option> </term>
+ <listitem>
+ <para>
+ <!--
+ Show snapshot comments in the snapshots listings.
+ -->
+ )Bã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B®ã)Bƒ$)Bªã)B‚$)B¹ã)Bƒˆ$)B表示)Bã$)B§ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B«å¯¾)Bã™ã‚‹ã‚$)B³ã)Bƒ$)B¡ã)Bƒ$)B³ã)Bƒˆã‚’$)B表示)Bã™ã‚‹$)B．ø
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term> <option>-r,--restore snapshot-name</option> </term>
+ <listitem>
+ <para>
+ <!--
+ Restore the named snapshot, meaning a full new container is created which is a copy of the snapshot.
+ -->
+ )B指$)Bå®)Bšã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã‚’ãƒ$)Bªã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B™ã‚‹$)B．ã)B“ã‚Œã$)B¯ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B®ã)B‚$)B³ã)Bƒ”ãƒ$)B¼ã)B$)B§ã)B‚ã‚‹$)Bå®)BŒå…$)B¨ã)B$)B«æ)B–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ$)Bä½)Bœ$)B製ã)B•ã‚Œã‚‹ã$)B¨ã)B„ã†ã“ã$)B¨ã)B$)B§ã)B™$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term> <option>newname</option> </term>
+ <listitem>
+ <para>
+ <!--
+ 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.
+ -->
+ )Bã‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã‚’ãƒ$)Bªã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B™ã‚‹éš›$)Bï¼)BŒæœ€$)Bå¾)BŒã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³å)B¼•æ•$)B°ã)B$)B¯ã)Bƒ$)Bªã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B•ã‚ŒãŸã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)Bå‰ã$)B¨ã)B—ã$)B¦ä½¿)Bç”$)B¨ã)B•ã‚Œã$)B¾ã)B™$)B．ã)B‚‚ã—åå‰ãŒ$)B与ã)Bˆã‚‰ã‚Œã$)B¦ã)B$)Bªã)B„å $)B´å)Bˆ$)Bï¼)BŒå…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒç $)B´å)B£Šã•ã‚Œ$)Bï¼)BŒãƒ$)Bªã)B‚$)B¹ã)Bƒˆã‚$)B¢ã)B•ã‚Œã‚‹ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«ç½®)Bãæ›ãˆã‚‰ã‚Œã$)B¾ã)B™$)B．ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆå…ƒã‚’削é™$)B¤ã)B™ã‚‹ã“ã$)B¨ã)B$)B¯ï)B¼Œoverlayfs 㨠zfs ãŒãƒãƒƒã‚$)B¯ã)B‚$)B¨ã)Bƒ$)B³ã)Bƒ‰ã$)B®ã)B‚$)B¹ã)BƒŠãƒƒãƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒƒãƒˆã$)B§ã)B$)B¯å)B‡$)Bºæ)B$)B¥ã)B$)Bªã)B„ã“ã$)B¨ã)B$)B«æ³¨)Bæ„ãŒ$)Bå¿)B…$)Bè¦)Bã$)B§ã)B™$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ </refsect1>
+
+ &commonoptions;
+
+ &seealso;
+
+ <refsect1>
+ <title>Author</title>
+ <para>Serge Hallyn <email>serge.hallyn at ubuntu.com </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-start-ephemeral.sgml.in b/doc/ja/lxc-start-ephemeral.sgml.in
index 6491a21..7d4e6d3 100644
--- a/doc/ja/lxc-start-ephemeral.sgml.in
+++ b/doc/ja/lxc-start-ephemeral.sgml.in
@@ -1,3 +1,4 @@
+
<!--
(C) Copyright Canonical Ltd. 2013
@@ -17,7 +18,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>
diff --git a/doc/ja/lxc-start.sgml.in b/doc/ja/lxc-start.sgml.in
index 43abc97..b5491a6 100644
--- a/doc/ja/lxc-start.sgml.in
+++ b/doc/ja/lxc-start.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-stop.sgml.in b/doc/ja/lxc-stop.sgml.in
index 6c2a5df..b421826 100644
--- a/doc/ja/lxc-stop.sgml.in
+++ b/doc/ja/lxc-stop.sgml.in
@@ -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>
@@ -56,6 +56,11 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<cmdsynopsis>
<command>lxc-stop</command>
<arg choice="req">-n <replaceable>name</replaceable></arg>
+ <arg choice="opt">-W</arg>
+ <arg choice="opt">-r</arg>
+ <arg choice="opt">-t <replaceable>timeout</replaceable></arg>
+ <arg choice="opt">-k</arg>
+ <arg choice="opt">-s</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -64,16 +69,112 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<para>
<!--
- <command>lxc-stop</command> kills all the processes inside the
- container. This command should be used if the processes are no
- longer accessible and can no be exited normally.
+ <command>lxc-stop</command> reboots, cleanly shuts down, or kills
+ all the processes inside the container. By default, it will
+ request a clean shutdown of the container (by sending SIGPWR to
+ the container), wait 60 seconds for the container to exit, and
+ returns. If the container fails to cleanly exit, then after 60
+ seconds the container will be sent the
+ <command>lxc.stopsignal</command> to force it to shut down.
-->
- <command>lxc-stop</command> )Bã$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå†…ã$)B®å)B…$)B¨ã)B$)B¦ã)B$)B®ã)Bƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B‚’ kill ã—ã$)B¾ã)B™$)B．ã)B‚‚ã—$)Bï¼)BŒãƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B$)B«ã)B‚$)B¢ã)B‚$)B¯ã)B‚$)B»ã)B‚$)B¹ã)B$)B§ã)Bã$)Bªã)B„å $)B´å)Bˆã‚„$)Bï¼)BŒæ™$)B®é)B€šã$)B«å)Bœ$)Bæ¢ã)B$)B§ã)Bã$)Bªã)B„å $)B´å)Bˆã$)B¯ï)B¼Œã“ã$)B®ã)B‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ã‚’$)B使ã)B†ã$)B¹ã)Bã$)B§ã)B™$)Bï¼
+ <command>lxc-stop</command> )Bã$)B¯ï)B¼Œãƒ$)Bªã)Bƒ–ãƒ$)B¼ã)Bƒˆ$)Bï¼)BŒã‚$)B¯ã)Bƒ$)Bªã)Bƒ$)B¼ã)Bƒ$)B³ã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå†…ã$)B®å)B…$)B¨ã)B$)B¦ã)B$)B®ã)Bƒ—ãƒ$)Bã)B‚$)B»ã)B‚$)B¹ã)B® kill ã$)B®ã)B$)B©ã)B‚Œã‹ã‚’$)Bè¡)BŒã„ã$)B¾ã)B™$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B§ã)B$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ$)B¼ã)Bƒ$)B³ã)B$)Bªã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)B‚’ (SIGPWR ã‚’ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«é)B€ã‚‹ã“ã$)B¨ã)B§) $)Bè¡)BŒã„$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ç)Bµ‚$)Bäº)B†ã‚’ 60 $)Bç§)B’$)Bå¾)B…ã$)B¡ï)B¼Œreturn ã—ã$)B¾ã)B™$)B．ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒã‚$)B¯ã)Bƒ$)Bªã)Bƒ$)B¼ã)Bƒ$)B³ã)B$)B«ç)Bµ‚$)Bäº)B†ã™ã‚‹ã$)B®ã)B$)B«å¤±)Bæ•—ã—ãŸå $)B´å)Bˆ$)Bï¼)BŒ60 $)Bç§)B’$)Bå¾)B…ã$)B£ã)BŸ$)Bå¾)BŒ$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã« <command>lxc.stopsignal</command> ã$)B§æ)BŒ‡$)Bå®)Bšã—ãŸã‚$)B·ã)B‚$)B°ã)BƒŠãƒ$)B«ã)B‚’é€ã‚Š$)Bï¼)BŒ$)Bå¼·å)Bˆ$)B¶ç)Bš„ã$)B«ã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)B—ã$)B¾ã)B™$)B．ì
+ </para>
+
+ <para>
+ <!--
+ The <optional>-W</optional>, <optional>-r</optional>, <optional>-s</optional>
+ and <optional>-k</optional> options specify the action to perform.
+ <optional>-W</optional> indicates that after performing the specified
+ action, <command>lxc-stop</command> should immediately exit, while
+ <optional>-t TIMEOUT</optional> specifies the maximum amount of time
+ to wait for the container to complete the shutdown or reboot.
+ -->
+ <optional>-W</optional>, <optional>-r</optional>, <optional>-s</optional>, <optional>-k</optional> )Bã‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯å)B®Ÿ$)Bè¡)BŒã™ã‚‹éš›ã$)B®ã)B‚$)B¢ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．¼optional>-W</optional> )Bã$)B¯ï)B¼ŒæŒ‡$)Bå®)Bšã—ãŸã‚$)B¢ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B®å)B¾Œã$)B«ï)B¼Œ<command>lxc-stop</command> ã$)B¯é)B€Ÿã‚„ã‹ã$)B«ç)Bµ‚$)Bäº)B†ã—ã$)B¾ã)B™$)B．ä)B¸€æ–$)B¹ï)B¼Œ<optional>-t TIMEOUT</optional> ã$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ$)Bå®)BŒå…$)B¨ã)B$)B«ã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)B‚„ãƒ$)Bªã)Bƒ–ãƒ$)B¼ã)Bƒˆã™ã‚‹ã$)B®ã)B‚’$)Bå¾)B…ã$)B¤æ)B™‚é–“ã$)B®æ)Bœ€$)B大å)B€$)B¤ã)B‚’$)Bè¨å)B®šã—ã$)B¾ã)B™$)Bï¼
</para>
</refsect1>
- &commonoptions;
+ <refsect1>
+ <title>Options</title>
+ <variablelist>
+
+ <varlistentry>
+ <term>
+ <option>-r,--reboot </option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Request a reboot of the container.
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ$)Bªã)Bƒ–ãƒ$)B¼ã)Bƒˆã‚’ãƒ$)Bªã)B‚$)B¯ã)B‚$)B¨ã)B‚$)B¹ã)Bƒˆã—ã$)B¾ã)B™$)B．®
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>-s,--shutdown </option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Only request a clean shutdown, do not kill the container tasks if the
+ clean shutdown fails.
+ -->
+ )Bã‚$)B¯ã)Bƒ$)Bªã)Bƒ$)B¼ã)Bƒ$)B³ã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)B ã‘ã‚’ãƒ$)Bªã)B‚$)B¯ã)B‚$)B¨ã)B‚$)B¹ã)Bƒˆã—ã$)B¾ã)B™$)B．ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ$)B¼ã)Bƒ$)B³ã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)BŒ$)B失æ)B•—ã—ãŸå $)B´å)Bˆ$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¿ã)B‚$)B¹ã)B‚$)B¯ã)B‚’ kill ã—ã$)B¾ã)B›ã‚“$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>-k,--kill </option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Rather than requesting a clean shutdown of the container, explicitly
+ kill all tasks in the container. This is the legacy
+ <command>lxc-stop</command> behavior.
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ$)B¼ã)Bƒ$)B³ã)B‚$)B·ã)Bƒ$)B£ã)Bƒƒãƒˆãƒ€ã‚$)B¦ã)Bƒ$)B³ã)B‚’ãƒ$)Bªã)B‚$)B¯ã)B‚$)B¨ã)B‚$)B¹ã)Bƒˆã™ã‚‹ã$)B®ã)B$)B§ã)B$)Bªã)B，明ç$)B¢º)Bã$)B«ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå†…ã$)B®å)B…$)B¨ã)B$)B¦ã)B$)B®ã)B‚$)B¿ã)B‚$)B¹ã)B‚$)B¯ã)B‚’ kill ã—ã$)B¾ã)B™$)B．ã)B“ã‚Œã$)B¯ï)B¼Œ$)B以å)B‰ã® <command>lxc-stop</command> ã$)B®å)B‹•$)Bä½)Bœã$)B§ã)B™$)B．î
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>-W,--nowait </option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Simply perform the requestion action (reboot, shutdown, or hard
+ kill) and exit.
+ -->
+ )Bãƒ$)Bªã)B‚$)B¯ã)B‚$)B¨ã)B‚$)B¹ã)Bƒˆã•ã‚ŒãŸã‚$)B¢ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ³ (reboot, shutdown, $)Bå¼·å)Bˆ$)B¶ç)Bš„㪠kill) ã‚’$)Bå®)BŸ$)Bè¡)BŒã™ã‚‹ã ã‘㧠(ã™ãã«) $)Bçµ)B‚$)Bäº)B†ã—ã$)B¾ã)B™$)B．â
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>-t,--timeout <replaceable>TIMEOUT</replaceable></option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Wait TIMEOUT seconds before hard-stopping the container of (in
+ the reboot case) returning failure.
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å¼·)Båˆ$)B¶å)Bœ$)Bæ¢ï)B¼Œ$)B失æ)B•—ã‚’ã‚’$)Bè¿)B”ã—ã$)B¦å¼·)Båˆ$)B¶å)Bœ$)Bæ)B¢ (ãƒ$)Bªã)Bƒ–ãƒ$)B¼ã)Bƒˆã$)B®å)B $)B´å)Bˆ) ã$)B¾ã)B§ TIMEOUT $)Bç§)B’$)Bå¾)B…ã$)B¡ã)B$)B¾ã)B™$)B．Î
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
<refsect1>
<title><!-- Diagnostic -->診æ)B–</title>
@@ -107,7 +208,6 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</listitem>
</varlistentry>
-
</variablelist>
</refsect1>
diff --git a/doc/ja/lxc-top.sgml.in b/doc/ja/lxc-top.sgml.in
index 9f80855..0f1ef64 100644
--- a/doc/ja/lxc-top.sgml.in
+++ b/doc/ja/lxc-top.sgml.in
@@ -17,7 +17,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
-->
diff --git a/doc/ja/lxc-unfreeze.sgml.in b/doc/ja/lxc-unfreeze.sgml.in
index a565bb7..0762697 100644
--- a/doc/ja/lxc-unfreeze.sgml.in
+++ b/doc/ja/lxc-unfreeze.sgml.in
@@ -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>
diff --git a/doc/ja/lxc-unshare.sgml.in b/doc/ja/lxc-unshare.sgml.in
index 3625443..bdd7cd3 100644
--- a/doc/ja/lxc-unshare.sgml.in
+++ b/doc/ja/lxc-unshare.sgml.in
@@ -20,7 +20,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>
@@ -55,7 +55,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<refsynopsisdiv>
<cmdsynopsis>
- <command>lxc-clone</command>
+ <command>lxc-unshare</command>
<arg choice="req">-s <replaceable>namespaces</replaceable></arg>
<arg choice="req">-u <replaceable>user</replaceable></arg>
<arg choice="req">command</arg>
@@ -131,14 +131,14 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
To spawn a new shell with its own UTS (hostname) namespace,
<programlisting>
- lxc-clone -s UTSNAME /bin/bash
+ lxc-unshare -s UTSNAME /bin/bash
</programlisting>
If the hostname is changed in that shell, the change will not be
reflected on the host.
-->
)Bè‡$)Bªèº«)Bã® UTS(hostname)åå‰$)B空é)B–“ã$)B§ã)B‚$)B·ã)B‚$)B§ã)Bƒ$)B«ã)B‚’$)Bèµ·å)B‹•ã™ã‚‹ã$)B«ã)B$)B¯ä»¥ä¸)B‹ã$)B®ã)B‚ˆã†ã$)B«å)B®Ÿ$)Bè¡)BŒã—ã$)B¾ã)B™$)B．ã
<programlisting>
- lxc-clone -s UTSNAME /bin/bash
+ lxc-unshare -s UTSNAME /bin/bash
</programlisting>
)Bã‚‚ã—$)Bï¼)BŒãã$)B®ã)B‚$)B·ã)B‚$)B§ã)Bƒ$)B«ä)B¸Šã$)B§ã)Bƒ›ã‚$)B¹ã)Bƒˆåã‚’$)Bå¤)B‰æ›$)B´ã)B—ã$)B¦ã)B‚‚$)Bï¼)BŒãã$)B®å)B¤‰æ›$)B´ã)B$)B¯ã)Bƒ›ã‚$)B¹ã)Bƒˆã$)B«ã)B$)B¯å)Bæ˜ ã•ã‚Œã$)B¾ã)B›ã‚“$)Bï¼)B‚
</para>
@@ -146,7 +146,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
To spawn a shell in a new network, pid, and mount namespace,
<programlisting>
- lxc-clone -s "NETWORK|PID|MOUNT" /bin/bash
+ lxc-unshare -s "NETWORK|PID|MOUNT" /bin/bash
</programlisting>
The resulting shell will have pid 1 and will see no network interfaces.
After re-mounting /proc in that shell,
@@ -157,7 +157,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
)Bæ–$)B°ã)B—ã„ãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ï)B¼Œpid$)Bï¼)BŒãƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆåå‰$)B空é)B–“ã$)B§ã)B‚$)B·ã)B‚$)B§ã)Bƒ$)B«ã)B‚’$)Bèµ·å)B‹•ã™ã‚‹ã$)B«ã)B$)B¯ä»¥ä¸)B‹ã$)B®ã)B‚ˆã†ã$)B«å)B®Ÿ$)Bè¡)BŒã—ã$)B¾ã)B™$)B．ð
<programlisting>
- lxc-clone -s "NETWORK|PID|MOUNT" /bin/bash
+ lxc-unshare -s "NETWORK|PID|MOUNT" /bin/bash
</programlisting>
)Bãã$)B®ç)Bµæžœ$)Bèµ·å)B‹•ã™ã‚‹ã‚$)B·ã)B‚$)B§ã)Bƒ$)B«ã)B¯ pid ㌠1 ã$)B¨ã)B$)Bªã)B‚Š$)Bï¼)BŒãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B‚$)B¤ã)Bƒ$)B³ã)B‚$)B¿ã)Bƒ$)B¼ã)Bƒ•ã‚$)B§ã)Bƒ$)B¼ã)B‚$)B¹ã)BŒã$)Bªã)B„ã$)B§ã)B—ょã†$)B．ã)Bã$)B®ã)B‚$)B·ã)B‚$)B§ã)Bƒ$)B«ä)B¸Šã§ /proc ã‚’å†ãƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã—ãŸ$)Bå¾)BŒ
<programlisting>
diff --git a/doc/ja/lxc-version.sgml.in b/doc/ja/lxc-version.sgml.in
index 3743201..713f8d1 100644
--- a/doc/ja/lxc-version.sgml.in
+++ b/doc/ja/lxc-version.sgml.in
@@ -17,7 +17,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>
diff --git a/doc/ja/lxc-wait.sgml.in b/doc/ja/lxc-wait.sgml.in
index 1dffa50..3d38f5d 100644
--- a/doc/ja/lxc-wait.sgml.in
+++ b/doc/ja/lxc-wait.sgml.in
@@ -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>
diff --git a/doc/ja/lxc.conf.sgml.in b/doc/ja/lxc.conf.sgml.in
index 572ad0a..8fe1494 100644
--- a/doc/ja/lxc.conf.sgml.in
+++ b/doc/ja/lxc.conf.sgml.in
@@ -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.
-->
- è¨å)B®šãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å)B‰$)B²ã)B‚Š$)Bå½)B“ã$)B¦ã)B‚‰ã‚Œã‚‹$)Bæ§)B˜ã€…ã$)Bªã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ãƒ$)Bªã)B‚$)B½ã)Bƒ$)B¼ã)B‚$)B¹ã)B‚’$)Bå®)Bš$)B義ã)B—ã$)B¾ã)B™$)B．ç¾æ)B™‚ç‚$)B¹ã)B$)B§ã)B$)B¯ï)B¼Œutsname$)Bï¼)BŒãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ï)B¼Œãƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆãƒã‚$)B¤ã)Bƒ$)B³ã)Bƒˆ$)Bï¼)BŒroot フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ $)Bï¼)BŒcontrol groups ãŒã‚$)Bµã)Bƒãƒ$)B¼ã)Bƒˆã•ã‚Œã$)B¾ã)B™$)B．í
+ è¨å)B®šãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«å)B‰$)B²ã)B‚Š$)Bå½)B“ã$)B¦ã)B‚‰ã‚Œã‚‹$)Bæ§)B˜ã€…ã$)Bªã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ãƒ$)Bªã)B‚$)B½ã)Bƒ$)B¼ã)B‚$)B¹ã)B‚’$)Bå®)Bš$)B義ã)B—ã$)B¾ã)B™$)B．ç¾æ)B™‚ç‚$)B¹ã)B$)B§ã)B$)B¯ï)B¼Œutsname$)Bï¼)BŒãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ï)B¼Œãƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆãƒã‚$)B¤ã)Bƒ$)B³ã)Bƒˆ$)Bï¼)BŒroot フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ $)Bï¼)BŒãƒ$)B¦ã)Bƒ$)B¼ã)B‚$)B¶å)Bå‰$)B空é)B–“$)Bï¼)BŒcontrol groups ãŒã‚$)Bµã)Bƒãƒ$)B¼ã)Bƒˆã•ã‚Œã$)B¾ã)B™$)B．î
</para>
<para>
@@ -91,12 +91,44 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</para>
<refsect2>
+ <title><!-- Configuration -->è¨å)B®š</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.
+ -->
+ è¤)B‡æ•$)B°ã)B$)B®é)B–$)B¢ä)B¿‚ã™ã‚‹ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ç®¡)Bç†ã‚’$)B容æ)B˜“ã$)B«ã)B™ã‚‹ãŸã‚ã$)B«ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®è¨å®)Bšãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B«å)Bˆ$)B¥ã)B$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚’ãƒ$)Bã)Bƒ$)B¼ã)Bƒ‰ã™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．ä)B¾‹ãˆã$)B°ï)B¼Œãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B$)B®è¨å®)Bšã‚’$)Bï¼)BŒ$)Bè¤)B‡æ•$)B°ã)B$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã‹ã‚‰ include ã•ã›ã‚‹ã‚ˆã†ã« 1 ã$)B¤ã)B$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B«å)B®š$)B義ã)B™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．ã)Bã$)B®å)B $)B´å)Bˆ$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ$)Bä»)B–ã$)B®ã)Bƒ›ã‚$)B¹ã)Bƒˆã$)B«ç§»)Bå‹•ã™ã‚‹ã$)B¨ï)B¼Œãã$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B ã‘ã‚’æ›$)B´æ)B–$)B°ã)B™ã‚‹$)Bå¿)B…$)Bè¦)BãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã$)B¾ã)B›ã‚“$)B．ô
+ </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 )Bã•ã›ãŸã„フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．énclude )Bã™ã‚‹ãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B¯ï)B¼Œlxc $)Bè¨å)B®šãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B®ã)Bƒ•ã‚$)B©ã)Bƒ$)B¼ã)Bƒžãƒƒãƒˆã$)B¨ã)B—ã$)B¦æ)Bœ‰åŠ$)B¹ã)B$)B§ã)B$)Bªã)B‘ã‚Œã$)B°ã)B„ã‘ã$)B¾ã)B›ã‚“$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+ <refsect2>
<title><!-- Architecture -->)Bã‚$)B¢ã)Bƒ$)B¼ã)B‚$)Bã)Bƒ†ã‚$)B¯ã)Bƒãƒ£</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>
-->
)Bãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B$)B«å¯¾)Bã—ã$)B¦è)B¡Œã†ã‚$)B¢ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)Bï¼
</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.
-->
)Bホã‚$)B¹ã)Bƒˆå$)B´ã)B‹ã‚‰$)B使ã)B‚れる$)Bï¼)BŒãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B$)B®ä)B½œæˆã$)B¨è¨å®)BšãŒ$)Bæ¸)Bˆã‚“ã $)Bå¾)BŒã$)B«å)B®Ÿ$)Bè¡)BŒã™ã‚‹ã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トを指$)Bå®)Bšã—ã$)B¾ã)B™$)B．以ä¸)B‹ã$)B®å)B¼•æ•$)B°ã)BŒã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã$)B«æ¸¡)Bã•ã‚Œã$)B¾ã)B™: ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå$)Bï¼)BŒ$)Bè¨å)B®šã‚$)B»ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³å)B(net)$)B．ï
- </para>
- <para>
)Bãã$)B®å)B¾Œã$)B®å)B¼•æ•$)B°ã)B$)B¯ã)B‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã$)B®ã)Bƒ•ãƒƒã‚$)B¯ã)B$)B§ä½¿)Bã‚れる$)Bè¨å)B®šã‚$)B»ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B«ä)B¾$)Bå)B˜ã—ã$)B¾ã)B™$)B．以ä¸)B‹ãŒãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã$)B«ã)B‚ˆã$)B£ã)B$)B¦ä½¿)Bã‚ã‚Œã$)B¾ã)B™: $)Bå®)BŸ$)Bè¡)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ã‚$)Bã)B‚$)B¹ã)Bƒˆ (up)$)Bï¼)BŒãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B$)B®ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ— (empty/veth/macvlan/phys)
- </para>
- <para>
)Bãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B$)B®ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ—ã$)B«ã)B‚ˆã$)B£ã)B$)B¦ã)B$)B¯ï)B¼Œæ›$)B´ã)B$)B«å)Bˆ$)B¥ã)B$)B®å)B¼•æ•$)B°ã)BŒ$)B渡ã)B•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã$)B¾ã)B›ã‚“: veth/macvlan/phys ã$)B®å)B $)B´å)Bˆ (ホã‚$)B¹ã)Bƒˆå$)B´ã)B®) デãƒã‚$)B¤ã)B‚$)B¹å)B
</para>
+ <para>
+ <!--
+ Standard output from the script is logged at debug level.
+ Standard error is not logged, but can be captured by the
+ hook redirecting its standard error to standard output.
+ -->
+ )Bã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã‹ã‚‰ã$)B®æ)B¨™$)Bæº)B–å‡$)Bºå)BŠ›ã¯ debug ãƒ$)B¬ã)Bƒ™ãƒ$)B«ã)B$)B§ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B™$)B．æ)B¨™$)Bæº)B–ã‚$)B¨ã)Bƒ$)B©ã)Bƒ$)B¼å)B‡$)Bºå)BŠ›ã$)B¯ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B›ã‚“$)B．ã)B—ã‹ã—$)Bï¼)BŒãƒ•ãƒƒã‚$)B¯ã)B$)B®æ)B¨™$)Bæº)B–ã‚$)B¨ã)Bƒ$)B©ã)Bƒ$)B¼å)B‡$)Bºå)BŠ›ã‚’$)Bæ¨)B™$)Bæº)B–å‡$)Bºå)BŠ›ã$)B«ã)Bƒ$)Bªã)Bƒ€ã‚$)B¤ã)Bƒ$)B¬ã)B‚$)B¯ã)Bƒˆã™ã‚‹ã“ã$)B¨ã)B$)B«ã)B‚ˆã‚Š$)Bä¿)B$)Bå)B˜ã™ã‚‹ã“ã$)B¨ã)B$)B¯å¯è)Bƒ$)B½ã)B$)B§ã)B™$)B．á
+ </para>
</listitem>
</varlistentry>
@@ -522,6 +558,14 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
)Bãã$)B®å)B¾Œã$)B®å)B¼•æ•$)B°ã)B$)B¯ã)B‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã$)B®ã)Bƒ•ãƒƒã‚$)B¯ã)B$)B§ä½¿)Bã‚れる$)Bè¨å)B®šã‚$)B»ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B«ä)B¾$)Bå)B˜ã—ã$)B¾ã)B™$)B．以ä¸)B‹ãŒãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã$)B«ã)B‚ˆã$)B£ã)B$)B¦ä½¿)Bã‚ã‚Œã$)B¾ã)B™: $)Bå®)BŸ$)Bè¡)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ã‚$)Bã)B‚$)B¹ã)Bƒˆ (up)$)Bï¼)BŒãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B$)B®ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ— (empty/veth/macvlan/phys)$)B．Â
)Bãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B$)B®ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ—ã$)B«ã)B‚ˆã$)B£ã)B$)B¦ã)B$)B¯ï)B¼Œæ›$)B´ã)B$)B«å)Bˆ$)B¥ã)B$)B®å)B¼•æ•$)B°ã)BŒ$)B渡ã)B•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã$)B¾ã)B›ã‚“: veth/macvlan/phys$)B．ã)Bã—ã$)B¦æ)Bœ€$)Bå¾)BŒã« (ホã‚$)B¹ã)Bƒˆå$)B´ã)B®) デãƒã‚$)B¤ã)B‚$)B¹å)BãŒ$)B渡ã)B•ã‚Œã$)B¾ã)B™$)B．ò
</para>
+ <para>
+ <!--
+ Standard output from the script is logged at debug level.
+ Standard error is not logged, but can be captured by the
+ hook redirecting its standard error to standard output.
+ -->
+ )Bã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã‹ã‚‰ã$)B®æ)B¨™$)Bæº)B–å‡$)Bºå)BŠ›ã¯ debug ãƒ$)B¬ã)Bƒ™ãƒ$)B«ã)B$)B§ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B™$)B．æ)B¨™$)Bæº)B–ã‚$)B¨ã)Bƒ$)B©ã)Bƒ$)B¼å)B‡$)Bºå)BŠ›ã$)B¯ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B›ã‚“$)B．ã)B—ã‹ã—$)Bï¼)BŒãƒ•ãƒƒã‚$)B¯ã)B$)B®æ)B¨™$)Bæº)B–ã‚$)B¨ã)Bƒ$)B©ã)Bƒ$)B¼å)B‡$)Bºå)BŠ›ã‚’$)Bæ¨)B™$)Bæº)B–å‡$)Bºå)BŠ›ã$)B«ã)Bƒ$)Bªã)Bƒ€ã‚$)B¤ã)Bƒ$)B¬ã)B‚$)B¯ã)Bƒˆã™ã‚‹ã“ã$)B¨ã)B$)B«ã)B‚ˆã‚Š$)Bä¿)B$)Bå)B˜ã™ã‚‹ã“ã$)B¨ã)B$)B¯å¯è)Bƒ$)B½ã)B$)B§ã)B™$)Bï¼
+ </para>
</listitem>
</varlistentry>
</variablelist>
@@ -563,7 +607,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
If the container is configured with a root filesystem and the
inittab file is setup to use the console, you may want to specify
- where goes the output of this console.
+ where the output of this console goes.
-->
)Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B§ã)Bƒ$)B«ã)Bƒ$)B¼ã)Bƒˆãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã‚’æŒã$)B¤ã)B‚ˆã†ã$)B«è¨å®)Bšã•ã‚Œã$)B¦ã)BŠã‚Š$)Bï¼)BŒinittab フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B§ã)B‚$)B³ã)Bƒ$)B³ã)B‚$)B½ã)Bƒ$)B¼ã)Bƒ$)B«ã)B$)B®ä½¿)Bç”$)B¨ã)BŒ$)Bè¨å)B®šã•ã‚Œã$)B¦ã)B„ã‚‹å $)B´å)Bˆ$)Bï¼)BŒã“ã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)B‚$)B½ã)Bƒ$)B¼ã)Bƒ$)B«ã)B$)B®å)B‡$)Bºå)BŠ›ãŒã$)B©ã)B“ã$)B«ã)B$)Bªã)B•ã‚Œã‚‹ã$)B®ã)B‹ã‚’指$)Bå®)Bšã—ãŸã„ã$)B¨æ)B€ã†ã$)B§ã)B—ょã†$)B．ç
</para>
@@ -589,16 +633,16 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<title><!-- Console through the ttys -->tty )Bを通ã—ãŸã‚$)B³ã)Bƒ$)B³ã)B‚$)B½ã)Bƒ$)B¼ã)Bƒ«</title>
<para>
<!--
- If the container is configured with a root filesystem and the
- inittab file is setup to launch a getty on the ttys. This
- option will specify the number of ttys to be available for the
- container. The number of getty in the inittab file of the
- container should not be greater than the number of ttys
- specified in this configuration file, otherwise the excess
- getty sessions will die and respawn indefinitly giving
- annoying messages on the console.
+ This option is useful if the container is configured with a root
+ filesystem and the inittab file is setup to launch a getty on the
+ ttys. The option specifies the number of ttys to be available for
+ the container. The number of gettys in the inittab file of the
+ container should not be greater than the number of ttys specified
+ in this option, otherwise the excess getty sessions will die and
+ respawn indefinitely giving annoying messages on the console or in
+ <filename>/var/log/messages</filename>.
-->
- )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒãƒ$)B«ã)Bƒ$)B¼ã)Bƒˆãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã$)B§è¨å®)Bšã•ã‚Œã$)B¦ã)BŠã‚Š$)Bï¼)BŒinittab フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B§ tty $)Bä¸)BŠã« getty ã$)B®é)B–‹$)Bå§)B‹ãŒ$)Bè¨å)B®šã•ã‚Œã$)B¦ã)B„ã‚‹å $)B´å)Bˆ$)Bï¼)BŒã“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒåˆ$)B©ç)B”$)B¨å)B‡$)Bºæ)B$)B¥ã)B‚‹ tty ã$)B®æ)B•$)B°ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® inittab フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«å)B†…ã® getty ã$)B®æ)B•$)B°ã)B$)B¨ï)B¼Œã“ã$)B®è¨å®)Bšãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B«æ)BŒ‡$)Bå®)Bšã•ã‚Œã‚‹ tty ã$)B®æ)B•$)B°ã)B$)B¯ç)B‰ã—ãã™ã‚‹$)Bå¿)B…$)Bè¦)BãŒã‚ã‚Šã$)B¾ã)B™$)B．ã)B•ã‚‚ã$)Bªã)B„ã$)B¨ï)B¼Œgetty ã$)B¯æ)Bœ€$)Bçµ)B‚çš„ã$)B«ã)B‚$)B³ã)Bƒ$)B³ã)B‚$)B½ã)Bƒ$)B¼ã)Bƒ$)B«ã)B$)B«ã)B†ã$)B£ã)B$)B¨ã)BŠã—ã„ãƒ$)B¡ã)Bƒƒã‚$)B»ã)Bƒ$)B¼ã)B‚$)B¸ã)B‚’$)Bå¤)Bšæ•$)B°è¡¨ç¤ºã)B—ã$)Bªã)BŒã‚‰ç”Ÿ$)Bæ»ã)B‚’$)Bç¹°ã)B‚Š$)Bè¿)B”ã™ã$)B§ã)B—ょã†$)Bï¼
+ )Bã“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ root フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã‚’æŒã$)B¤ã)B‚ˆã†ã$)B«è¨å®)Bšã•ã‚Œã$)B¦ã)BŠã‚Š$)Bï¼)BŒinittab フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B§ tty $)Bä¸)BŠã« getty ã$)B®èµ·)Bå‹•ãŒ$)Bè¨å)B®šã•ã‚Œã$)B¦ã)B„ã‚‹å $)B´å)Bˆã$)B«å½¹)Bã$)B«ç)B«‹ã$)B¡ã)B$)B¾ã)B™$)B．ã)B“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B§å)Bˆ$)B©ç)B”$)B¨ã)B$)B§ã)Bã‚‹ tty ã$)B®æ)B•$)B°ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．énittab )Bフã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B«è¨å®)Bšã™ã‚‹ getty ã$)B®æ)B•$)B°ã)B$)B¯ï)B¼Œã“ã$)B®ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B®æ)BŒ‡$)Bå®)Bšã™ã‚‹ tty ã$)B®æ)B•$)B°ã)B‚ˆã‚Š$)B大ã)Bãã—ã$)B¦ã)B$)B¯ã)B„ã‘ã$)B¾ã)B›ã‚“$)B．ã)B•ã‚‚ã$)Bªã)B‘ã‚Œã$)B°ï)B¼Œ$)Bè¶)B…éŽã—ãŸåˆ†ã® getty ã‚$)B»ã)Bƒƒã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)B‚$)B½ã)Bƒ$)B¼ã)Bƒ$)B«ã)B‹ /var/log/messages ã$)B«ã)B†ã$)B£ã)B$)B¨ã)B†ã—ã„ãƒ$)B¡ã)Bƒƒã‚$)B»ã)Bƒ$)B¼ã)B‚$)B¸ã)B‚’生$)Bæ»ã)B‚’$)B表示)Bã—ã$)Bªã)BŒã‚‰$)Bï¼)BŒ$)Bæ°¸ä)B¹…ã$)B«ç)B”Ÿ$)Bæ»ã)B‚’$)Bç¹°ã)B‚Š$)Bè¿)B”ã™ã$)B§ã)B—ょã†$)Bï¼
</para>
<variablelist>
<varlistentry>
@@ -664,7 +708,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
rootfs LXC will mount a fresh tmpfs under <filename>/dev</filename>
(limited to 100k) and fill in a minimal set of initial devices.
This is generally required when starting a container containing
- a "systemd" based "init" but may be optional at other times. Addional
+ a "systemd" based "init" but may be optional at other times. Additional
devices in the containers /dev directory may be created through the
use of the <option>lxc.hook.autodev</option> hook.
-->
@@ -735,15 +779,27 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
specify a file location in
the <filename>fstab</filename> format, containing the
- mount informations. If the rootfs is an image file or a
- device block and the fstab is used to mount a point
+ mount information. If the rootfs is an image file or a
+ block device and the fstab is used to mount a point
somewhere in this rootfs, the path of the rootfs mount
point should be prefixed with the
<filename>@LXCROOTFSMOUNT@</filename> default path or
the value of <option>lxc.rootfs.mount</option> if
- specified.
+ specified. Note that when mounting a filesystem from an
+ image file or block device the third field (fs_vfstype)
+ cannot be auto as with
+ <citerefentry>
+ <refentrytitle>mount</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>
+ but must be explicitly specified.
-->
- )Bマã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã$)B«é)B–$)B¢ã)B™ã‚‹æƒ…å $)B±ã)BŒæ›$)B¸ã)B‹ã‚ŒãŸ <filename>fstab</filename> フã‚$)B©ã)Bƒ$)B¼ã)Bƒžãƒƒãƒˆã$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B®å)B $)B´æ)B‰€ã‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．òootfs )BãŒã‚$)B¤ã)Bƒ$)B¡ã)Bƒ$)B¼ã)B‚$)B¸ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚„デãƒã‚$)B¤ã)B‚$)B¹ã)Bƒ–ãƒ$)Bã)Bƒƒã‚$)B¯ã)B$)B§ï)B¼Œfstab フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)BŒã“ã® rootfs 内ã$)B®ã)B$)B©ã)B“ã‹ã‚’マã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã™ã‚‹ãŸã‚ã$)B«ä½¿)Bã‚れるå $)B´å)Bˆ$)Bï¼)BŒrootfs ã$)B®ã)Bƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆãƒã‚$)B¤ã)Bƒ$)B³ã)Bƒˆã$)B®ã)Bƒ‘ã‚$)B¹ã)B$)B¯ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆãƒ‘ã‚$)B¹ã)B$)B§ã)B‚ã‚‹ <filename>@LXCROOTFSMOUNT@</filename> ã‹$)Bï¼)BŒã‚‚ã—ã㯠<option>lxc.rootfs.mount</option> ãŒæŒ‡$)Bå®)Bšã•ã‚Œã$)B¦ã)B„ã‚‹å $)B´å)Bˆã$)B¯ï)B¼Œãã$)B®å)B€$)B¤ã)B‚’å‰ã$)B«ä)B»˜ã‘ã‚‹$)Bå¿)B…$)Bè¦)BãŒã‚ã‚Šã$)B¾ã)B™$)B．ù
+ )Bマã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã$)B«é)B–$)B¢ã)B™ã‚‹æƒ…å $)B±ã)BŒæ›$)B¸ã)B‹ã‚ŒãŸ <filename>fstab</filename> フã‚$)B©ã)Bƒ$)B¼ã)Bƒžãƒƒãƒˆã$)B®ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B®å)B $)B´æ)B‰€ã‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．òootfs )BãŒã‚$)B¤ã)Bƒ$)B¡ã)Bƒ$)B¼ã)B‚$)B¸ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚„ブãƒ$)Bã)Bƒƒã‚$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B$)B§ï)B¼Œfstab フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)BŒã“ã® rootfs 内ã$)B®ã)B$)B©ã)B“ã‹ã‚’マã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã™ã‚‹ãŸã‚ã$)B«ä½¿)Bã‚れるå $)B´å)Bˆ$)Bï¼)BŒrootfs ã$)B®ã)Bƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆãƒã‚$)B¤ã)Bƒ$)B³ã)Bƒˆã$)B®ã)Bƒ‘ã‚$)B¹ã)B$)B¯ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆãƒ‘ã‚$)B¹ã)B$)B§ã)B‚ã‚‹ <filename>@LXCROOTFSMOUNT@</filename> ã‹$)Bï¼)BŒã‚‚ã—ã㯠<option>lxc.rootfs.mount</option> ãŒæŒ‡$)Bå®)Bšã•ã‚Œã$)B¦ã)B„ã‚‹å $)B´å)Bˆã$)B¯ï)B¼Œãã$)B®å)B€$)B¤ã)B‚’å‰ã$)B«ä)B»˜ã‘ã‚‹$)Bå¿)B…$)Bè¦)BãŒã‚ã‚Šã$)B¾ã)B™$)B．ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ãŒã‚$)B¤ã)Bƒ$)B¡ã)Bƒ$)B¼ã)B‚$)B¸ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚„ブãƒ$)Bã)Bƒƒã‚$)B¯ã)Bƒ‡ãƒã‚$)B¤ã)B‚$)B¹ã)B‹ã‚‰ãƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã•ã‚Œã$)B¦ã)B„ã‚‹å $)B´å)Bˆ$)Bï¼)BŒ3 ã$)B¤ç)B›$)B®ã)B$)B®ã)Bƒ•ã‚$)B£ã)Bƒ$)B¼ã)Bƒ$)B«ã)Bƒ‰ (fs_vfstype) ã¯
+ <citerefentry>
+ <refentrytitle>mount</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>
+ )Bã$)B®ã)B‚ˆã†ã« auto を指$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)B$)B¯ã)B$)B§ã)Bãš$)Bï¼)BŒæ˜Žç$)B¢º)Bã$)B«æ)BŒ‡$)Bå®)Bšã—ã$)Bªã)B‘ã‚Œã$)B°ã)B„ã‘ã$)B¾ã)B›ã‚“$)B．å
</para>
</listitem>
</varlistentry>
@@ -912,8 +968,113 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>
+ <option>lxc.cap.keep</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Specify the capability to be kept in the container. All other
+ capabilities will be dropped.
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå†…ã$)B§ç¶)BæŒã™ã‚‹ã‚$)B±ã)Bƒ$)B¼ã)Bƒ‘ビãƒ$)Bªã)Bƒ†ã‚$)B£ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．æ)BŒ‡$)Bå®)Bšã—ãŸ$)B以å)B¤–ã$)B®å)B…$)B¨ã)B$)B¦ã)B$)B®ã)B‚$)B±ã)Bƒ$)B¼ã)Bƒ‘ビãƒ$)Bªã)Bƒ†ã‚$)B£ã)B$)B¯ã)Bƒ‰ãƒ$)Bã)Bƒƒãƒ—ã•ã‚Œã$)B¾ã)B™$)B．±
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect2>
+
+ <refsect2>
+ <title><!-- Apparmor profile -->Apparmor )Bプãƒ$)Bã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ«</title>
+ <para>
+ <!--
+ If lxc was compiled and installed with apparmor support, and the host
+ system has apparmor enabled, then the apparmor profile under which the
+ container should be run can be specified in the container
+ configuration. The default is <command>lxc-container-default</command>.
+ -->
+ lxc )B㌠apparmor ã‚$)Bµã)Bƒãƒ$)B¼ã)Bƒˆã$)B§ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ‘ã‚$)B¤ã)Bƒ$)B«ã)B•ã‚Œ$)Bï¼)BŒã‚$)B¤ã)Bƒ$)B³ã)B‚$)B¹ã)Bƒˆãƒ$)B¼ã)Bƒ$)B«ã)B•ã‚Œã$)B¦ã)B„ã‚‹å $)B´å)Bˆã$)B§ï)B¼Œãƒ›ã‚$)B¹ã)Bƒˆã§ apparmor ãŒæœ‰åŠ$)B¹ã)B$)Bªå)B $)B´å)Bˆ$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ$)Bå¾)B“ã$)B£ã)B$)B¦å)B‹•ãã$)B¹ã)B apparmor プãƒ$)Bã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®è¨å®)Bšã$)B§æ)BŒ‡$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã¯ <command>lxc-container-default</command> ã$)B§ã)B™$)B．¾
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>lxc.aa_profile</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Specify the apparmor profile under which the container should
+ be run. To specify that the container should be unconfined,
+ use
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ$)Bå¾)B“ã†ã$)B¹ã)B apparmor プãƒ$)Bã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)B．ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ apparmor ã$)B«ã)B‚ˆã‚‹åˆ$)B¶é)B™ã‚’å—ã‘ã$)Bªã)B„よã†ã$)B«è¨å®)Bšã™ã‚‹ã$)B«ã)B$)B¯ï)B¼Œ$)B以ä)B¸‹ã$)B®ã)B‚ˆã†ã$)B«è¨å®)Bšã—ã$)B¾ã)B™$)B．ã
+ </para>
+ <programlisting>lxc.aa_profile = unconfined</programlisting>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+ <refsect2>
+ <title><!-- SELinux context -->SELinux )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ã‚$)Bã)B‚$)B¹ã)Bƒˆ</title>
+ <para>
+ <!--
+ If lxc was compiled and installed with SELinux support, and the host
+ system has SELinux enabled, then the SELinux context under which the
+ container should be run can be specified in the container
+ configuration. The default is <command>unconfined_t</command>,
+ which means that lxc will not attempt to change contexts.
+ -->
+ lxc )B㌠SELinux ã‚$)Bµã)Bƒãƒ$)B¼ã)Bƒˆã$)B§ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ‘ã‚$)B¤ã)Bƒ$)B«ã)B•ã‚Œ$)Bï¼)BŒã‚$)B¤ã)Bƒ$)B³ã)B‚$)B¹ã)Bƒˆãƒ$)B¼ã)Bƒ$)B«ã)B•ã‚Œã$)B¦ã)B„ã‚‹å $)B´å)Bˆã$)B§ï)B¼Œãƒ›ã‚$)B¹ã)Bƒˆã§ SELinux ãŒæœ‰åŠ$)B¹ã)B$)Bªå)B $)B´å)Bˆ$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒ$)Bå¾)B“ã$)B£ã)B$)B¦å)B‹•ãã$)B¹ã)B SELinux ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ã‚$)Bã)B‚$)B¹ã)Bƒˆã$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®è¨å®)Bšã$)B§æ)BŒ‡$)Bå®)Bšã™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã¯ <command>unconfined_t</command> ã$)B§ã)B‚ã‚Š$)Bï¼)BŒã“れ㯠lxc ãŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ã‚$)Bã)B‚$)B¹ã)Bƒˆã‚’$)Bå¤)B‰ãˆã$)Bªã)B„ã$)B¨ã)B„ã†æ„å‘$)B³ã)B$)B«ã)B$)Bªã)B‚Šã$)B¾ã)B™$)B．·
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>lxc.se_context</option>
+ </term>
+ <listitem>
+ <para>
+ Specify the SELinux context under which the container should
+ be run or <command>unconfined_t</command>. For example
+ </para>
+ <programlisting>lxc.se_context = unconfined_u:unconfined_r:lxc_t:s0-s0:c0.c1023</programlisting>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+ <refsect2>
+ <title><!-- Seccomp configuration -->Seccomp )Bã$)B®è¨å®)Bš</title>
+ <para>
+ <!--
+ A container can be started with a reduced set of available
+ system calls by loading a seccomp profile at startup. The
+ seccomp configuration file should begin with a version number
+ (which currently must be 1) on the first line, a policy type
+ (which must be 'whitelist') on the second line, followed by a
+ list of allowed system call numbers, one per line.
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B¯ï)B¼Œ$)Bèµ·å)B‹•æ™‚ã« seccomp プãƒ$)Bã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚’ãƒ$)Bã)Bƒ$)B¼ã)Bƒ‰ã™ã‚‹ã“ã$)B¨ã)B$)B§ï)B¼Œåˆ$)B©ç)B”$)B¨å¯è)Bƒ$)B½ã)B$)Bªã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã‚$)B³ã)Bƒ$)B¼ã)Bƒ$)B«ã)B‚’$)Bæ¸)B›ã‚‰ã—ã$)B¦èµ·)Bå‹•ã™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．óeccomp )Bã$)B®è¨å®)Bšãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B¯ï)B¼Œæœ€åˆã$)B®è)B¡ŒãŒãƒãƒ$)B¼ã)B‚$)B¸ã)Bƒ$)B§ã)Bƒ$)B³ç)B•$)Bªå)B· (ç¾åœ$)B¨ã)B¯ 1 ã$)B§ã)B$)Bªã)B‘ã‚Œã$)B°ã)B$)Bªã)B‚‰ã$)Bªã)B„) ã$)B§ï)B¼Œ2 $)Bè¡)BŒç›$)B®ã)B$)B¯ã)Bƒãƒ$)Bªã)B‚$)B·ã)Bƒ$)B¼ã)B$)B®ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ— ('whitelist' ã$)B§ã)B$)Bªã)B‘ã‚Œã$)B°ã)B$)Bªã)B‚‰ã$)Bªã)B„)$)Bï¼)BŒã$)B§å)B§‹ã$)B¾ã)B‚‹$)Bå¿)B…$)Bè¦)BãŒã‚ã‚Š$)Bï¼)BŒãã$)B®å)B¾Œã« 1 $)Bè¡)BŒã”ã$)B¨ã)B$)B«å)Bˆ$)B©ç)B”$)B¨å¯è)Bƒ$)B½ã)B$)Bªã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã‚$)B³ã)Bƒ$)B¼ã)Bƒ$)B«ã)B$)B®ç)B•$)Bªå·ã)BŒæ›$)B¸ã)B‹ã‚ŒãŸãƒ$)Bªã)B‚$)B¹ã)BƒˆãŒ$)Bç¶)Bšãã$)B¾ã)B™$)Bï¼
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>lxc.seccomp</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Specify a file containing the seccomp configuration to
+ load before the container starts.
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒã‚$)B¹ã)B‚$)B¿ã)Bƒ$)B¼ã)Bƒˆã™ã‚‹å‰ã$)B«ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ‰ã™ã‚‹ seccomp ã$)B®è¨å®)Bšã‚’å$)B«ã)B‚€ãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚’指$)Bå®)Bšã—ã$)B¾ã)B™$)Bï¼
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
<refsect2>
<title><!-- UID mappings -->UID )Bã$)B®ã)Bƒžãƒƒãƒ”ãƒ$)B³ã)B‚°</title>
<para>
@@ -952,13 +1113,59 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</refsect2>
<refsect2>
- <title><!-- Startup hooks -->)Bã‚$)B¹ã)B‚$)B¿ã)Bƒ$)B¼ã)Bƒˆæ™‚ã$)B®ã)Bƒ•ãƒƒã‚¯</title>
+ <title><!-- Container hooks -->)Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ•ãƒƒã‚¯</title>
<para>
<!--
- Startup hooks are programs or scripts which can be executed
+ Container hooks are programs or scripts which can be executed
at various times in a container's lifetime.
-->
- èµ·å)B‹•æ™‚ã$)B®ã)Bƒ•ãƒƒã‚$)B¯ã)B$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)B˜$)Bç¶)BšæœŸé–“ã$)B®è)B‰$)B²ã)B€…ã$)Bªå)B $)B´é)B$)B¢ã)B$)B§å)B®Ÿ$)Bè¡)BŒã™ã‚‹ã“ã$)B¨ã)B$)B®ã)B$)B§ã)Bるプãƒ$)Bã)B‚$)B°ã)Bƒ$)B©ã)Bƒ ã‚„ã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã$)B§ã)B™$)B．«
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ•ãƒƒã‚$)B¯ã)B$)B¯ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)B˜$)Bç¶)BšæœŸé–“ã$)B®è)B‰$)B²ã)B€…ã$)Bªå)B $)B´é)B$)B¢ã)B$)B§å)B®Ÿ$)Bè¡)BŒã™ã‚‹ã“ã$)B¨ã)B$)B®ã)B$)B§ã)Bるプãƒ$)Bã)B‚$)B°ã)Bƒ$)B©ã)Bƒ ã‚„ã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã$)B§ã)B™$)Bï¼
+ </para>
+ <para>
+ <!--
+ 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>
+ </itemizedlist>
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ•ãƒƒã‚$)B¯ã)BŒ$)Bå®)BŸ$)Bè¡)BŒã•ã‚Œã‚‹ã$)B¨ã)B$)Bï¼)BŒæƒ…å $)B±ã)BŒã‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ãƒ$)B©ã)B‚$)B¤ã)Bƒ$)B³å)B¼•æ•$)B°ã)B$)B¨ç)B’$)B°å)B¢ƒ$)Bå¤)B‰æ•$)B°ã)B$)B®ä¸¡)Bæ–$)B¹ã)B‚’通ã—ã$)B¦æ¸¡)Bã•ã‚Œã$)B¾ã)B™$)B．å)B¼•æ•$)B°ã)B¯:
+ <itemizedlist>
+ <listitem>)Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå</listitem>
+ <listitem>)Bã‚$)B»ã)B‚$)B¯ã)B‚$)B·ã)Bƒ$)B§ã)Bƒ³ ($)B常ã)B« 'lxc')</listitem>
+ <listitem>)Bフッã‚$)B¯ã)B$)B®ã)B‚$)B¿ã)B‚$)B¤ã)Bƒ— ('clone' ã‚„ 'pre-mount' ã$)Bªã)B©)</listitem>
+ <listitem>追å)BŠ ã$)B®å)B¼•æ•$)B°ï)B¼Žãlone フッã‚$)B¯ã)B$)B®å)B $)B´å)Bˆ$)Bï¼)BŒlxc-clone ã$)B«æ¸¡)Bã•ã‚Œã‚‹$)B追å)BŠ ã$)B®å)B¼•æ•$)B°ã)B$)B¯ï)B¼Œãƒ•ãƒƒã‚$)B¯ã)B$)B¸ã)B$)B®å)B¼•æ•$)B°ã)B$)B¨ã)B—ã$)B¦è¿½)BåŠ ã•ã‚Œã$)B¾ã)B™$)B．¼/listitem>
+ </itemizedlist>
+ 以ä)B¸‹ã$)B®ç)B’$)B°å)B¢ƒ$)Bå¤)B‰æ•$)B°ã)BŒã‚$)B»ã)Bƒƒãƒˆã•ã‚Œã$)B¾ã)B™$)B．õ
+ <itemizedlist>
+ <listitem> LXC_NAME: )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå</listitem>
+ <listitem> LXC_ROOTFS_MOUNT: )Bマã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã•ã‚ŒãŸ root フã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B‚$)B·ã)B‚$)B¹ã)Bƒ†ãƒ ã$)B¸ã)B$)B®ã)Bƒ‘ス</listitem>
+ <listitem> LXC_CONFIG_FILE: )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®è¨å®)Bšãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B®ã)Bƒ‘ス </listitem>
+ <listitem> LXC_SRC_NAME: clone )Bフッã‚$)B¯ã)B$)B®å)B $)B´å)Bˆ$)Bï¼)BŒå…ƒã$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)Bå‰</listitem>
+ <listitem> LXC_ROOTFS_PATH: )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã® lxc.rootfs ã‚$)B¨ã)Bƒ$)B³ã)Bƒˆãƒ$)Bªï)B¼Žã“ã‚Œã$)B¯ã)Bƒžã‚$)B¦ã)Bƒ$)B³ã)Bƒˆã•ã‚ŒãŸ rootfs ãŒ$)Bå)B˜åœ$)B¨ã)B™ã‚‹å $)B´æ)B‰€ã$)B«ã)B$)B¯ã)B$)Bªã)B‚‰ã$)Bªã)B„ã$)B§ã)B—ょã†$)B．ã)Bã‚Œã$)B«ã)B¯ LXC_ROOTFS_MOUNT ã‚’$)B使ç)B”$)B¨ã)B—ã$)B¦ã)Bã ã•ã„$)B．¼/listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ <!--
+ Standard output from the hooks is logged at debug level.
+ Standard error is not logged, but can be captured by the
+ hook redirecting its standard error to standard output.
+ -->
+ )Bã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã‹ã‚‰ã$)B®æ)B¨™$)Bæº)B–å‡$)Bºå)BŠ›ã¯ debug ãƒ$)B¬ã)Bƒ™ãƒ$)B«ã)B$)B§ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B™$)B．æ)B¨™$)Bæº)B–ã‚$)B¨ã)Bƒ$)B©ã)Bƒ$)B¼å)B‡$)Bºå)BŠ›ã$)B¯ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B›ã‚“$)B．ã)B—ã‹ã—$)Bï¼)BŒãƒ•ãƒƒã‚$)B¯ã)B$)B®æ)B¨™$)Bæº)B–ã‚$)B¨ã)Bƒ$)B©ã)Bƒ$)B¼å)B‡$)Bºå)BŠ›ã‚’$)Bæ¨)B™$)Bæº)B–å‡$)Bºå)BŠ›ã$)B«ã)Bƒ$)Bªã)Bƒ€ã‚$)B¤ã)Bƒ$)B¬ã)B‚$)B¯ã)Bƒˆã™ã‚‹ã“ã$)B¨ã)B$)B«ã)B‚ˆã‚Š$)Bä¿)B$)Bå)B˜ã™ã‚‹ã“ã$)B¨ã)B$)B¯å¯è)Bƒ$)B½ã)B$)B§ã)B™$)B．á
</para>
<variablelist>
<varlistentry>
@@ -1070,10 +1277,30 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</listitem>
</varlistentry>
</variablelist>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>lxc.hook.clone</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ A hook to be run when the container is cloned to a new one.
+ See <refentrytitle><command>lxc-clone</command></refentrytitle>
+ <manvolnum>1</manvolnum> for more information.
+ -->
+ )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠãŒæ–$)B°ã)B—ã„ã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«ã)B‚$)B¯ã)Bƒ$)Bã)Bƒ$)B¼ã)Bƒ$)B³ã)B•ã‚Œã‚‹éš›ã$)B«å)B®Ÿ$)Bè¡)BŒã•ã‚Œã‚‹ãƒ•ãƒƒã‚$)B¯ï)B¼Žè$)B©³)Bã—ãã¯
+ <refentrytitle><command>lxc-clone</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ )Bã‚’å‚ç…$)B§ã)B—ã$)B¦ã)Bã ã•ã„$)B．î
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect2>
<refsect2>
- <title><!-- Startup hooks Environment Variables -->)Bã‚$)B¹ã)B‚$)B¿ã)Bƒ$)B¼ã)Bƒˆæ™‚ã$)B®ã)Bƒ•ãƒƒã‚$)B¯ã)B$)B§ä½¿)Bãˆã‚‹ç’$)B°å)B¢ƒ$)Bå¤)B‰æ•°</title>
+ <title><!-- Container hooks Environment Variables -->)Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ•ãƒƒã‚$)B¯ã)B$)B§ä½¿)Bãˆã‚‹ç’$)B°å)B¢ƒ$)Bå¤)B‰æ•°</title>
<para>
<!--
A number of environment variables are made available to the startup
@@ -1093,7 +1320,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<para>
<!--
The LXC name of the container. Useful for logging messages
- in commmon log environments. [<option>-n</option>]
+ in common log environments. [<option>-n</option>]
-->
LXC )Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®å)Bå‰$)B．å)B…$)B±é)B€šã$)B®ã)Bƒ$)Bã)B‚$)B°ç)B’$)B°å)B¢ƒå†…ã$)B§ã)B$)B®ã)Bƒ$)Bã)B‚$)B°ã)Bƒ$)B¡ã)Bƒƒã‚$)B»ã)Bƒ$)B¼ã)B‚$)B¸ã)B$)B«ä½¿)Bã†ã$)B¨ã)Bã$)B«ä¾¿)Båˆ$)B©ã)B$)B§ã)B™$)B．Û<option>-n</option>]
</para>
@@ -1111,7 +1338,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
Host relative path to the container configuration file. This
gives the container to reference the original, top level,
configuration file for the container in order to locate any
- addotional configuration information not otherwise made
+ additional configuration information not otherwise made
available. [<option>-f</option>]
-->
)Bã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®è¨å®)Bšãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B®ã)Bƒ›ã‚$)B¹ã)Bƒˆ$)Bä¸)BŠã$)B§ã)B$)B®ã)Bƒ‘ã‚$)B¹ï)B¼Žã“ã‚Œã$)B¯ï)B¼Œ$)Bä»)B–ã$)B®æ)B–$)B¹æ)B³•ã$)B§ã)B$)B¯å)B¾—られã$)Bªã)B„$)B追å)BŠ ã$)B®è¨å®)Bšæƒ…å $)B±ã)B‚’$)Bè¦)B‹ã$)B¤ã)B‘ã‚‹ãŸã‚ã$)B«ï)B¼Œã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B«ï)B¼Œå…ƒã$)B®ï)B¼Œãƒˆãƒƒãƒ—ãƒ$)B¬ã)Bƒ™ãƒ$)B«ã)B$)B®è¨å®)Bšãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B®ä)B½$)Bç½®ã)B‚’$)B与ã)Bˆã‚‹ã‚‚ã$)B®ã)B$)B§ã)B™$)Bï¼ [<option>-f</option>]
@@ -1193,6 +1420,70 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</refsect2>
+ <refsect2>
+ <title><!-- Logging -->)Bãƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚°</title>
+ <para>
+ <!--
+ Logging can be configured on a per-container basis. By default,
+ depending upon how the lxc package was compiled, container startup
+ is logged only at the ERROR level, and logged to a file named after
+ the container (with '.log' appended) either under the container path,
+ or under @LOGPATH at .
+ -->
+ )Bãƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B$)B¯ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã”ã$)B¨ã)B$)B«è¨å®)Bšã™ã‚‹ã“ã$)B¨ã)BŒå¯èƒ$)B½ã)B$)B§ã)B™$)B．ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B§ã)B$)B¯ï)B¼Œlxc パッã‚$)B±ã)Bƒ$)B¼ã)B‚$)B¸ã)B$)B®ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ‘ã‚$)B¤ã)Bƒ$)B«æ)B$)B¡ä»¶)Bã$)B«ä)B¾$)Bå)B˜ã—$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)B‚$)B¹ã)B‚$)B¿ã)Bƒ$)B¼ã)Bƒˆã‚$)B¢ã)Bƒƒãƒ—㯠ERROR ãƒ$)B¬ã)Bƒ™ãƒ$)B«ã)B$)B§ã)B$)B®ã)B$)B¿ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œ$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®ã)Bƒ‘ã‚$)B¹ä»¥ä¸)B‹ã‹$)Bï¼)BŒ@LOGPATH@ $)B以ä)B¸‹ã$)B®ã)B$)B©ã)B$)B¡ã)B‚‰ã‹ã$)B«ã)B‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠå (ã$)B®å)B¾Œã« '.log' ãŒ$)Bä»)B˜$)B与ã)B•ã‚Œã‚‹) ã‚’ã‚‚ã$)B¨ã)B$)B«ã)B—ãŸåå‰ã$)B§ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B™$)B．å
+ </para>
+ <para>
+ <!--
+ Both the default log level and the log file can be specified in the
+ container configuration file, overriding the default behavior. Note
+ that the configuration file entries can in turn be overridden by the
+ command line options to <command>lxc-start</command>.
+ -->
+ )Bデフã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B®ã)Bƒ$)Bã)B‚$)B°ã)Bƒ$)B¬ã)Bƒ™ãƒ$)B«ã)B$)B¨ã)Bƒ$)Bã)B‚$)B°ã)Bƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B¯ä¸¡)Bæ–$)B¹ã)B$)B¨ã)B‚‚$)Bï¼)BŒã‚$)B³ã)Bƒ$)B³ã)Bƒ†ãƒŠã$)B®è¨å®)Bšãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«å)B†…ã$)B§æ)BŒ‡$)Bå®)Bšã•ã‚Œ$)Bï¼)BŒãƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã$)B®å)B€$)B¤ã)B‚’$)Bä¸)BŠæ›$)B¸ã)Bã—ã$)B¾ã)B™$)B．å)BŒ$)Bæ§)B˜ã$)B«ï)B¼Œ$)Bè¨å)B®šãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ã)B$)B®ã)B‚$)B¨ã)Bƒ$)B³ã)Bƒˆãƒ$)Bªã)B¯ <command>lxc-start</command> ã$)B®ã)B‚$)B³ã)Bƒžãƒ$)B³ã)Bƒ‰ãƒ$)B©ã)B‚$)B¤ã)Bƒ$)B³ã)B‚$)Bªã)Bƒ—ã‚$)B·ã)Bƒ$)B§ã)Bƒ$)B³ã)B$)B§ä)B¸Šæ›$)B¸ã)Bã™ã‚‹ã“ã$)B¨ã)B‚‚å¯èƒ$)B½ã)B$)B§ã)B™$)Bï¼
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>
+ <option>lxc.loglevel</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ The level at which to log. The log level is an integer in
+ the range of 0..8 inclusive, where a lower number means more
+ verbose debugging. In particular 0 = trace, 1 = debug, 2 =
+ info, 3 = notice, 4 = warn, 5 = error, 6 = critical, 7 =
+ alert, and 8 = fatal. If unspecified, the level defaults
+ to 5 (error), so that only errors and above are logged.
+ -->
+ )Bãƒ$)Bã)B‚$)B°ã)B‚’å–$)Bå¾)B—ã™ã‚‹ãƒ$)B¬ã)Bƒ™ãƒ$)B«ï)B¼Žãƒ$)Bã)B‚$)B°ã)Bƒ$)B¬ã)Bƒ™ãƒ$)B«ã)B¯ 0..8 ã$)B®ç)B¯„å›$)B²ã)B$)B®æ)B•$)B´æ)B•$)B°ã)B$)B§ã)B™$)B．æ)B•$)B°å)B—ãŒ$)Bå°)Bã•ã„ã$)B»ã)B$)B©å)B†—é•$)B·ã)B$)Bªã)Bƒ‡ãƒãƒƒã‚$)B°ã)B‚’æ„å‘$)B³ã)B—ã$)B¾ã)B™$)B．å)B…$)B·ä)B½“çš„ã$)B«ã)B$)B¯ï)B¼Œ0 = trace, 1 = debug, 2 = info, 3 = notice, 4 = warn, 5 = error, 6 = critical, 7 = alert, and 8 = fatal ã$)B§ã)B™$)B．æ)BŒ‡$)Bå®)Bšã•ã‚Œã$)Bªã)B„å $)B´å)Bˆ$)Bï¼)BŒãƒ$)B¬ã)Bƒ™ãƒ$)B«ã)B$)B®ã)Bƒ‡ãƒ•ã‚$)B©ã)Bƒ$)B«ã)Bƒˆã¯ 5 (error) ã$)B§ï)B¼Œãã‚Œ$)B以ä)B¸Šã$)B®ã)B‚$)B¨ã)Bƒ$)B©ã)Bƒ$)B¼ã)BŒãƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B™$)Bï¼
+ </para>
+ <para>
+ <!--
+ Note that when a script (such as either a hook script or a
+ network interface up or down script) is called, the script's
+ standard output is logged at level 1, debug.
+ -->
+ ()Bフッã‚$)B¯ã)B‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トやãƒãƒƒãƒˆãƒ$)B¯ã)Bƒ$)B¼ã)B‚$)B¯ã)B‚$)B¤ã)Bƒ$)B³ã)B‚$)B¿ã)Bƒ$)B¼ã)Bƒ•ã‚$)B§ã)Bƒ$)B¼ã)B‚$)B¹ã)B$)B®èµ·)Bå‹•$)Bï¼)BŒåœ$)Bæ¢æ)B™‚ã$)B®ã)B‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã$)B®ã)B‚ˆã†ãª) ã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トãŒå‘$)B¼ã)B$)B°ã)B‚ŒãŸæ™‚$)Bï¼)BŒã‚$)B¹ã)B‚$)B¯ã)Bƒ$)Bªã)Bƒ—トã$)B®æ)B¨™$)Bæº)B–å‡$)Bºå)BŠ›ã¯ level 1 ã® debug ã$)B§ã)Bƒ$)Bã)B‚$)B®ã)Bƒ$)B³ã)B‚$)B°ã)B•ã‚Œã$)B¾ã)B™$)B．«
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <option>lxc.logfile</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ The file to which logging info should be written.
+ -->
+ )Bãƒ$)Bã)B‚$)B°æ)Bƒ…å $)B±ã)B‚’æ›$)B¸ã)B$)Bè¾¼ã)B‚€ãƒ•ã‚$)B¡ã)B‚$)B¤ã)Bƒ$)B«ï)B¼‚
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
</refsect1>
<refsect1>
@@ -1321,6 +1612,11 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<manvolnum>5</manvolnum>
</citerefentry>
+ <citerefentry>
+ <refentrytitle><filename>capabilities</filename></refentrytitle>
+ <manvolnum>7</manvolnum>
+ </citerefentry>
+
</simpara>
</refsect1>
diff --git a/doc/ja/lxc.sgml.in b/doc/ja/lxc.sgml.in
index d72b487..637cfe6 100644
--- a/doc/ja/lxc.sgml.in
+++ b/doc/ja/lxc.sgml.in
@@ -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>
diff --git a/doc/ja/see_also.sgml.in b/doc/ja/see_also.sgml.in
index 5c635ce..6f8069e 100644
--- a/doc/ja/see_also.sgml.in
+++ b/doc/ja/see_also.sgml.in
@@ -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>
--
1.8.1.4
More information about the lxc-devel
mailing list