[lxc-devel] [PATCH] doc: Add description about ignoring lxc.cgroup.use when using cgmanager

[Stéphane Graber]

On Tue, Sep 23, 2014 at 10:36:03PM +0900, KATOH Yasufumi wrote:
> Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  doc/ja/lxc.system.conf.sgml.in | 3 +++
>  doc/lxc.system.conf.sgml.in    | 4 +++-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/ja/lxc.system.conf.sgml.in b/doc/ja/lxc.system.conf.sgml.in
> index 9ef669d..c34af93 100644
> --- a/doc/ja/lxc.system.conf.sgml.in
> +++ b/doc/ja/lxc.system.conf.sgml.in
> @@ -118,8 +118,11 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
>              <para>
>                <!--
>                Comma separated list of cgroup controllers to setup.
> +              Currently this configration will be ignored when LXC
> +              uses cgmanager to manage cgroups.
>                -->
>                使用する cgroup コントローラのコンマ区切りのリスト。
> +              現時点では、LXC が cgroup の管理を cgmanager 経由で行っている場合、この設定は無視されます。
>              </para>
>            </listitem>
>          </varlistentry>
> diff --git a/doc/lxc.system.conf.sgml.in b/doc/lxc.system.conf.sgml.in
> index 039c3db..e0ce684 100644
> --- a/doc/lxc.system.conf.sgml.in
> +++ b/doc/lxc.system.conf.sgml.in
> @@ -97,7 +97,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>            </term>
>            <listitem>
>              <para>
> -              Comma separated list of cgroup controllers to setup.
> +              Comma separated list of cgroup controllers to setup. 
> +              Currently this configration will be ignored when LXC
> +              uses cgmanager to manage cgroups.
>              </para>
>            </listitem>
>          </varlistentry>
> -- 
> 1.9.3 (Apple Git-50)
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140923/c3708c88/attachment.sig>