From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Wed, 27 Mar 2019 06:53:17 +0000 (+0900)
Subject: doc: Add lxc.cgroup.relative to lxc.container.conf(5)
X-Git-Tag: lxc-3.2.0~110^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3b7fd80d9617bf60c0c8772dfb45da68b8d2e26;p=thirdparty%2Flxc.git

doc: Add lxc.cgroup.relative to lxc.container.conf(5)

Only English and Japanese man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
---

diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index 65ebb44f4..4a5905e4e 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -1953,6 +1953,25 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
             </para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <option>lxc.cgroup.relative</option>
+          </term>
+          <listitem>
+            <para>
+              <!--
+              Set this to 1 to instruct LXC to never escape to the
+              root cgroup. This makes it easy for users to adhere to
+              restrictions enforced by cgroup2 and
+              systemd. Specifically, this makes it possible to run LXC
+              containers as systemd services.
+                -->
+              LXC に root cgroup へのエスケープを行わないように指示するには、この値を 1 に設定してください。
+              これにより、ユーザは cgroup2 と systemd が強制する制限を遵守するのが容易になります。
+              具体的には、これにより LXC コンテナを systemd のサービスとして実行できます。
+            </para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </refsect2>
 
diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 00b51a94a..ba88587d4 100644
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -1470,6 +1470,20 @@ dev/null proc/kcore none bind,relative 0 0
             </para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <option>lxc.cgroup.relative</option>
+          </term>
+          <listitem>
+            <para>
+              Set this to 1 to instruct LXC to never escape to the
+              root cgroup. This makes it easy for users to adhere to
+              restrictions enforced by cgroup2 and
+              systemd. Specifically, this makes it possible to run LXC
+              containers as systemd services.
+            </para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </refsect2>