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
7f135597
Unverified
Commit
7f135597
authored
Oct 18, 2017
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conf: lxc_setup() -> lxc_setup_child()
Closes #1857. Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
a04220de
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
conf.c
src/lxc/conf.c
+1
-1
conf.h
src/lxc/conf.h
+1
-1
start.c
src/lxc/start.c
+1
-1
No files found.
src/lxc/conf.c
View file @
7f135597
...
@@ -3079,7 +3079,7 @@ static bool verify_start_hooks(struct lxc_conf *conf)
...
@@ -3079,7 +3079,7 @@ static bool verify_start_hooks(struct lxc_conf *conf)
return
true
;
return
true
;
}
}
int
lxc_setup
(
struct
lxc_handler
*
handler
)
int
lxc_setup
_child
(
struct
lxc_handler
*
handler
)
{
{
int
ret
;
int
ret
;
const
char
*
name
=
handler
->
name
;
const
char
*
name
=
handler
->
name
;
...
...
src/lxc/conf.h
View file @
7f135597
...
@@ -377,7 +377,7 @@ extern int lxc_delete_autodev(struct lxc_handler *handler);
...
@@ -377,7 +377,7 @@ extern int lxc_delete_autodev(struct lxc_handler *handler);
extern
void
lxc_clear_includes
(
struct
lxc_conf
*
conf
);
extern
void
lxc_clear_includes
(
struct
lxc_conf
*
conf
);
extern
int
do_rootfs_setup
(
struct
lxc_conf
*
conf
,
const
char
*
name
,
extern
int
do_rootfs_setup
(
struct
lxc_conf
*
conf
,
const
char
*
name
,
const
char
*
lxcpath
);
const
char
*
lxcpath
);
extern
int
lxc_setup
(
struct
lxc_handler
*
handler
);
extern
int
lxc_setup
_child
(
struct
lxc_handler
*
handler
);
extern
int
setup_resource_limits
(
struct
lxc_list
*
limits
,
pid_t
pid
);
extern
int
setup_resource_limits
(
struct
lxc_list
*
limits
,
pid_t
pid
);
extern
int
find_unmapped_nsid
(
struct
lxc_conf
*
conf
,
enum
idtype
idtype
);
extern
int
find_unmapped_nsid
(
struct
lxc_conf
*
conf
,
enum
idtype
idtype
);
extern
int
mapped_hostid
(
unsigned
id
,
struct
lxc_conf
*
conf
,
extern
int
mapped_hostid
(
unsigned
id
,
struct
lxc_conf
*
conf
,
...
...
src/lxc/start.c
View file @
7f135597
...
@@ -937,7 +937,7 @@ static int do_start(void *data)
...
@@ -937,7 +937,7 @@ static int do_start(void *data)
}
}
/* Setup the container, ip, names, utsname, ... */
/* Setup the container, ip, names, utsname, ... */
ret
=
lxc_setup
(
handler
);
ret
=
lxc_setup
_child
(
handler
);
close
(
handler
->
data_sock
[
0
]);
close
(
handler
->
data_sock
[
0
]);
close
(
handler
->
data_sock
[
1
]);
close
(
handler
->
data_sock
[
1
]);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
...
...
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