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
27cd0177
Unverified
Commit
27cd0177
authored
Sep 09, 2017
by
Christian Brauner
Committed by
Stéphane Graber
Sep 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
start: remove dead variable
non-functional changes Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
77e7b5e2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
start.c
src/lxc/start.c
+3
-10
No files found.
src/lxc/start.c
View file @
27cd0177
...
...
@@ -1142,7 +1142,7 @@ static int lxc_spawn(struct lxc_handler *handler)
bool
wants_to_map_ids
;
int
saved_ns_fd
[
LXC_NS_MAX
];
struct
lxc_list
*
id_map
;
int
failed_before_rename
=
0
,
preserve_mask
=
0
;
int
preserve_mask
=
0
;
bool
cgroups_connected
=
false
;
id_map
=
&
handler
->
conf
->
id_map
;
...
...
@@ -1256,15 +1256,11 @@ static int lxc_spawn(struct lxc_handler *handler)
goto
out_delete_net
;
}
if
(
lxc_sync_wake_child
(
handler
,
LXC_SYNC_STARTUP
))
{
failed_before_rename
=
1
;
if
(
lxc_sync_wake_child
(
handler
,
LXC_SYNC_STARTUP
))
goto
out_delete_net
;
}
if
(
lxc_sync_wait_child
(
handler
,
LXC_SYNC_CONFIGURE
))
{
failed_before_rename
=
1
;
if
(
lxc_sync_wait_child
(
handler
,
LXC_SYNC_CONFIGURE
))
goto
out_delete_net
;
}
if
(
!
cgroup_create_legacy
(
handler
))
{
ERROR
(
"Failed to setup legacy cgroups for container
\"
%s
\"
."
,
name
);
...
...
@@ -1281,9 +1277,6 @@ static int lxc_spawn(struct lxc_handler *handler)
if
(
!
cgroup_chown
(
handler
))
goto
out_delete_net
;
if
(
failed_before_rename
)
goto
out_delete_net
;
handler
->
netnsfd
=
lxc_preserve_ns
(
handler
->
pid
,
"net"
);
if
(
handler
->
netnsfd
<
0
)
{
ERROR
(
"Failed to preserve network namespace"
);
...
...
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