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
3dad8c43
Commit
3dad8c43
authored
Jul 25, 2016
by
Stéphane Graber
Committed by
GitHub
Jul 25, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1100 from brauner/2016-07-25/fix_cgfsng_lxcfs_and_cgroupfs_checkfuns
cgfsng: fix is_lxcfs() and is_cgroupfs()
parents
9d206b25
2f62fb00
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
cgfsng.c
src/lxc/cgfsng.c
+3
-3
No files found.
src/lxc/cgfsng.c
View file @
3dad8c43
...
@@ -438,7 +438,7 @@ static bool is_lxcfs(const char *line)
...
@@ -438,7 +438,7 @@ static bool is_lxcfs(const char *line)
char
*
p
=
strstr
(
line
,
" - "
);
char
*
p
=
strstr
(
line
,
" - "
);
if
(
!
p
)
if
(
!
p
)
return
false
;
return
false
;
return
strncmp
(
p
,
" - fuse.lxcfs "
,
14
);
return
strncmp
(
p
,
" - fuse.lxcfs "
,
14
)
==
0
;
}
}
/*
/*
...
@@ -488,7 +488,7 @@ static bool is_cgroupfs(char *line)
...
@@ -488,7 +488,7 @@ static bool is_cgroupfs(char *line)
char
*
p
=
strstr
(
line
,
" - "
);
char
*
p
=
strstr
(
line
,
" - "
);
if
(
!
p
)
if
(
!
p
)
return
false
;
return
false
;
return
strncmp
(
p
,
" - cgroup "
,
10
);
return
strncmp
(
p
,
" - cgroup "
,
10
)
==
0
;
}
}
/* Add a controller to our list of hierarchies */
/* Add a controller to our list of hierarchies */
...
@@ -1350,7 +1350,7 @@ static bool cgfsng_mount(void *hdata, const char *root, int type)
...
@@ -1350,7 +1350,7 @@ static bool cgfsng_mount(void *hdata, const char *root, int type)
free
(
controllerpath
);
free
(
controllerpath
);
goto
bad
;
goto
bad
;
}
}
r
=
do_secondstage_mounts_if_needed
(
type
,
h
,
controllerpath
,
path2
,
r
=
do_secondstage_mounts_if_needed
(
type
,
h
,
controllerpath
,
path2
,
d
->
container_cgroup
);
d
->
container_cgroup
);
free
(
controllerpath
);
free
(
controllerpath
);
...
...
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