Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
8900b9eb
Unverified
Commit
8900b9eb
authored
Sep 18, 2013
by
Stéphane Graber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove trailing whitespaces
Signed-off-by:
Stéphane Graber
<
stgraber@ubuntu.com
>
parent
799f29ab
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
71 additions
and
75 deletions
+71
-75
common_options.sgml.in
doc/ja/common_options.sgml.in
+2
-2
lxc-attach.sgml.in
doc/ja/lxc-attach.sgml.in
+1
-1
lxc-cgroup.sgml.in
doc/ja/lxc-cgroup.sgml.in
+2
-2
lxc-checkconfig.sgml.in
doc/ja/lxc-checkconfig.sgml.in
+1
-1
lxc-checkpoint.sgml.in
doc/ja/lxc-checkpoint.sgml.in
+1
-1
lxc-clone.sgml.in
doc/ja/lxc-clone.sgml.in
+1
-1
lxc-console.sgml.in
doc/ja/lxc-console.sgml.in
+2
-2
lxc-create.sgml.in
doc/ja/lxc-create.sgml.in
+5
-5
lxc-destroy.sgml.in
doc/ja/lxc-destroy.sgml.in
+3
-3
lxc-device.sgml.in
doc/ja/lxc-device.sgml.in
+1
-2
lxc-execute.sgml.in
doc/ja/lxc-execute.sgml.in
+2
-2
lxc-freeze.sgml.in
doc/ja/lxc-freeze.sgml.in
+2
-2
lxc-info.sgml.in
doc/ja/lxc-info.sgml.in
+1
-1
lxc-kill.sgml.in
doc/ja/lxc-kill.sgml.in
+1
-1
lxc-ls.sgml.in
doc/ja/lxc-ls.sgml.in
+3
-4
lxc-monitor.sgml.in
doc/ja/lxc-monitor.sgml.in
+2
-2
lxc-netstat.sgml.in
doc/ja/lxc-netstat.sgml.in
+1
-1
lxc-ps.sgml.in
doc/ja/lxc-ps.sgml.in
+4
-5
lxc-restart.sgml.in
doc/ja/lxc-restart.sgml.in
+1
-1
lxc-shutdown.sgml.in
doc/ja/lxc-shutdown.sgml.in
+1
-1
lxc-start-ephemeral.sgml.in
doc/ja/lxc-start-ephemeral.sgml.in
+1
-1
lxc-start.sgml.in
doc/ja/lxc-start.sgml.in
+2
-2
lxc-stop.sgml.in
doc/ja/lxc-stop.sgml.in
+2
-2
lxc-unfreeze.sgml.in
doc/ja/lxc-unfreeze.sgml.in
+1
-1
lxc-unshare.sgml.in
doc/ja/lxc-unshare.sgml.in
+1
-1
lxc-version.sgml.in
doc/ja/lxc-version.sgml.in
+1
-1
lxc-wait.sgml.in
doc/ja/lxc-wait.sgml.in
+2
-3
lxc.conf.sgml.in
doc/ja/lxc.conf.sgml.in
+4
-4
lxc.sgml.in
doc/ja/lxc.sgml.in
+2
-2
see_also.sgml.in
doc/ja/see_also.sgml.in
+1
-1
cgroup.c
src/lxc/cgroup.c
+15
-15
cgroup.h
src/lxc/cgroup.h
+1
-1
commands.c
src/lxc/commands.c
+1
-1
No files found.
doc/ja/common_options.sgml.in
View file @
8900b9eb
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
@@ -110,7 +110,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<literal>NOTICE</literal>, <literal>INFO</literal>,
<literal>DEBUG</literal>.
-->
ログの優先度を <replaceable>LEVEL</replaceable> に設定します.デフォルトの優先度は <literal>ERROR</literal> です.以下の値を設定可能です:
ログの優先度を <replaceable>LEVEL</replaceable> に設定します.デフォルトの優先度は <literal>ERROR</literal> です.以下の値を設定可能です:
<literal>FATAL</literal>, <literal>CRIT</literal>,
<literal>WARN</literal>, <literal>ERROR</literal>,
<literal>NOTICE</literal>, <literal>INFO</literal>,
...
...
doc/ja/lxc-attach.sgml.in
View file @
8900b9eb
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-cgroup.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-checkconfig.sgml.in
View file @
8900b9eb
...
...
@@ -19,7 +19,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-checkpoint.sgml.in
View file @
8900b9eb
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-clone.sgml.in
View file @
8900b9eb
...
...
@@ -22,7 +22,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-console.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-create.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
@@ -160,7 +160,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
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
used and the following further options are available:
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
is the container name. <replaceable>--vgname vgname1</replaceable>
...
...
@@ -169,7 +169,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<replaceable>--fstype FSTYPE</replaceable> will create an FSTYPE
filesystem on the LV, rather than the default, which is ext4.
<replaceable>--fssize SIZE</replaceable> will create a LV (and
filesystem) of size SIZE rather than the default, which is 1G.
filesystem) of size SIZE rather than the default, which is 1G.
-->
<replaceable>backingstore</replaceable> には 'none' か 'dir' か 'lvm' か 'btrfs' のいずれかを指定します.デフォルトは 'none' で,コンテナのルートファイルシステムが <filename>@LXCPATH@/container/rootfs</filename> 以下のディレクトリであることを意味します.
'dir' は 'none' と同じ意味ですが,オプションとして <replaceable>--dir ROOTFS</replaceable> を指定することも可能です.このオプションは,デフォルトの代わりに特定のパス以下にコンテナの rootfs を置くということになります.
...
...
@@ -217,7 +217,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
メッセージの通り,コンテナを作成しようとしたけれども,同じ名前のコンテナが存在しています.<command>lxc-ls -l</command> コマンドを使って,システム上に存在する利用可能なコンテナのリストが表示できます.
</para>
</listitem>
</varlistentry>
</varlistentry>
</variablelist>
...
...
doc/ja/lxc-destroy.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
@@ -128,7 +128,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
破壊するために指定したコンテナが見つかりません.おそらくそのコンテナが存在しないのか,既に破壊された後なのでしょう.<command>lxc-ls -l</command> コマンドを使って,システム上に存在するコンテナのリストを得ることができます.
</para>
</listitem>
</varlistentry>
</varlistentry>
</variablelist>
...
...
doc/ja/lxc-device.sgml.in
View file @
8900b9eb
<!--
(C) Copyright Canonical Ltd. 2013
...
...
@@ -20,7 +19,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-execute.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-freeze.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-info.sgml.in
View file @
8900b9eb
...
...
@@ -19,7 +19,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-kill.sgml.in
View file @
8900b9eb
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-ls.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -22,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
@@ -249,7 +248,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<refsect1>
<title>See Also</title>
<simpara>
<simpara>
<citerefentry>
<refentrytitle>ls</refentrytitle>
<manvolnum>1</manvolnum>
...
...
doc/ja/lxc-monitor.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-netstat.sgml.in
View file @
8900b9eb
...
...
@@ -19,7 +19,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-ps.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -22,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
@@ -104,7 +103,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
specify the container <replaceable>NAME</replaceable>
to limit the output to the processes belonging
to this container name.
to this container name.
-->
<replaceable>name</replaceable> で指定したコンテナに属するプロセスのみ出力する.
</para>
...
...
@@ -118,7 +117,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<listitem>
<para>
<!--
limit the output to the processes belonging
limit the output to the processes belonging
to all lxc containers.
-->
全ての lxc コンテナに属するプロセスを出力する.
...
...
doc/ja/lxc-restart.sgml.in
View file @
8900b9eb
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-shutdown.sgml.in
View file @
8900b9eb
...
...
@@ -18,7 +18,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-start-ephemeral.sgml.in
View file @
8900b9eb
...
...
@@ -20,7 +20,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-start.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-stop.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-unfreeze.sgml.in
View file @
8900b9eb
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-unshare.sgml.in
View file @
8900b9eb
...
...
@@ -22,7 +22,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-version.sgml.in
View file @
8900b9eb
...
...
@@ -19,7 +19,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc-wait.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -22,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/lxc.conf.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
@@ -322,7 +322,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
ネットワークに対して行うアクションを指定します.
</para>
<para>
<!--
<option>up:</option> activates the interface.
...
...
@@ -465,7 +465,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<option>macvlan</option> network types.
-->
コンテナでゲートウェイとして使う IPv6 アドレスを指定します.アドレスは x::y というフォーマットです.例えば,2003:db8:1:0::1.
<option>auto</option> という特別な値を記述する事も可能です.これは (<option>lxc.network.link</option> で指定した) ブリッジインターフェースの最初のアドレスを使用し,それをゲートウェイに使うという意味になります.<option>auto</option> はネットワークタイプとして <option>veth</option> と <option>macvlan</option> を指定している時だけ有効となります.
</para>
</listitem>
...
...
doc/ja/lxc.sgml.in
View file @
8900b9eb
<!--
<!--
lxc: linux Container library
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
doc/ja/see_also.sgml.in
View file @
8900b9eb
...
...
@@ -21,7 +21,7 @@ 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
Translated into Japanese
by KATOH Yasufumi <karma at jazz.email.ne.jp>
-->
...
...
src/lxc/cgroup.c
View file @
8900b9eb
...
...
@@ -167,7 +167,7 @@ struct cgroup_meta_data *lxc_cgroup_load_meta2(const char **subsystem_whitelist)
tab1
=
strchr
(
line
,
'\t'
);
if
(
!
tab1
)
continue
;
continue
;
*
tab1
++
=
'\0'
;
tab2
=
strchr
(
tab1
,
'\t'
);
if
(
!
tab2
)
...
...
@@ -223,7 +223,7 @@ struct cgroup_meta_data *lxc_cgroup_load_meta2(const char **subsystem_whitelist)
colon1
=
strchr
(
line
,
':'
);
if
(
!
colon1
)
continue
;
continue
;
*
colon1
++
=
'\0'
;
colon2
=
strchr
(
colon1
,
':'
);
if
(
!
colon2
)
...
...
@@ -319,7 +319,7 @@ struct cgroup_meta_data *lxc_cgroup_load_meta2(const char **subsystem_whitelist)
* 1: parent id
* 2: device major:minor
* 3: mount prefix
* 4: mount point
* 4: mount point
* 5: per-mount options
* [optional X]: additional data
* X+7: "-"
...
...
@@ -1052,7 +1052,7 @@ char *lxc_cgroup_get_hierarchy_abs_path_handler(const char *subsystem, struct lx
if
(
!
info
)
return
NULL
;
if
(
info
->
designated_mount_point
)
{
mp
=
info
->
designated_mount_point
;
mp
=
info
->
designated_mount_point
;
}
else
{
mp
=
lxc_cgroup_find_mount_point
(
info
->
hierarchy
,
info
->
cgroup_path
,
true
);
if
(
!
mp
)
...
...
@@ -1079,7 +1079,7 @@ char *lxc_cgroup_get_hierarchy_abs_path(const char *subsystem, const char *name,
if
(
!
info
)
return
NULL
;
if
(
info
->
designated_mount_point
)
{
mp
=
info
->
designated_mount_point
;
mp
=
info
->
designated_mount_point
;
}
else
{
mp
=
lxc_cgroup_find_mount_point
(
info
->
hierarchy
,
info
->
cgroup_path
,
true
);
if
(
!
mp
)
...
...
@@ -1175,7 +1175,7 @@ int lxc_cgroup_get(const char *filename, char *value, size_t len, const char *na
* will be returned
* @name : name of container to connect to
* @lxcpath : the lxcpath in which the container is running
*
*
* This is the exported function, which determines cgpath from the
* lxc-start of the @name container running in @lxcpath.
*
...
...
@@ -1354,7 +1354,7 @@ int lxc_cgroup_nrtasks_handler(struct lxc_handler *handler)
}
if
(
info
->
designated_mount_point
)
{
mp
=
info
->
designated_mount_point
;
mp
=
info
->
designated_mount_point
;
}
else
{
mp
=
lxc_cgroup_find_mount_point
(
info
->
hierarchy
,
info
->
cgroup_path
,
false
);
if
(
!
mp
)
...
...
@@ -1402,7 +1402,7 @@ struct cgroup_process_info *lxc_cgroup_process_info_getx(const char *proc_pid_cg
colon1
=
strchr
(
line
,
':'
);
if
(
!
colon1
)
continue
;
continue
;
*
colon1
++
=
'\0'
;
colon2
=
strchr
(
colon1
,
':'
);
if
(
!
colon2
)
...
...
@@ -1476,7 +1476,7 @@ char **subsystems_from_mount_options(const char *mount_options, char **kernel_li
char
*
token
,
*
str
,
*
saveptr
=
NULL
;
char
**
result
=
NULL
;
size_t
result_capacity
=
0
;
size_t
result_count
=
0
;
size_t
result_count
=
0
;
int
saved_errno
;
int
r
;
...
...
@@ -1595,10 +1595,10 @@ char *cgroup_to_absolute_path(struct cgroup_mount_point *mp, const char *path, c
len
=
strlen
(
mp
->
mount_point
)
+
strlen
(
path
)
+
(
suffix
?
strlen
(
suffix
)
:
0
);
buf
=
calloc
(
len
+
1
,
1
);
rv
=
snprintf
(
buf
,
len
+
1
,
"%s%s%s"
,
mp
->
mount_point
,
path
,
suffix
?
suffix
:
""
);
if
(
rv
>
len
)
{
if
(
rv
>
len
)
{
free
(
buf
);
errno
=
ENOMEM
;
return
NULL
;
return
NULL
;
}
return
buf
;
...
...
@@ -1697,7 +1697,7 @@ bool cgroup_devices_has_allow_or_deny(struct lxc_handler *h, char *v, bool for_a
{
char
*
path
;
FILE
*
devices_list
;
char
*
line
=
NULL
;
char
*
line
=
NULL
;
size_t
sz
=
0
;
bool
ret
=
!
for_allow
;
const
char
*
parts
[
3
]
=
{
...
...
@@ -1738,7 +1738,7 @@ bool cgroup_devices_has_allow_or_deny(struct lxc_handler *h, char *v, bool for_a
goto
out
;
}
else
if
(
for_allow
&&
strcmp
(
line
,
v
)
==
0
)
{
ret
=
true
;
goto
out
;
goto
out
;
}
}
...
...
@@ -1756,7 +1756,7 @@ int cgroup_recursive_task_count(const char *cgroup_path)
DIR
*
d
;
struct
dirent
*
dent_buf
;
struct
dirent
*
dent
;
ssize_t
name_max
;
ssize_t
name_max
;
int
n
=
0
,
r
;
/* see man readdir_r(3) */
...
...
@@ -1820,7 +1820,7 @@ int cgroup_recursive_task_count(const char *cgroup_path)
return
n
;
}
int
count_lines
(
const
char
*
fn
)
int
count_lines
(
const
char
*
fn
)
{
FILE
*
f
;
char
*
line
=
NULL
;
...
...
src/lxc/cgroup.h
View file @
8900b9eb
...
...
@@ -146,7 +146,7 @@ extern int lxc_cgroup_get(const char *filename, char *value, size_t len, const c
* will be returned
* @name : name of container to connect to
* @lxcpath : the lxcpath in which the container is running
*
*
* This is the exported function, which determines cgpath from the
* lxc-start of the @name container running in @lxcpath.
*
...
...
src/lxc/commands.c
View file @
8900b9eb
...
...
@@ -404,7 +404,7 @@ static int lxc_cmd_get_cgroup_callback(int fd, struct lxc_cmd_req *req,
if
(
req
->
datalen
<
1
)
return
-
1
;
path
=
lxc_cgroup_get_hierarchy_path_handler
(
req
->
data
,
handler
);
if
(
!
path
)
return
-
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment