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
bb826cfe
Unverified
Commit
bb826cfe
authored
May 08, 2017
by
Christian Brauner
Committed by
Stéphane Graber
May 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conf: non-functional changes lxc_setup()
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
b55e06be
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
conf.c
src/lxc/conf.c
+2
-4
No files found.
src/lxc/conf.c
View file @
bb826cfe
...
@@ -1112,7 +1112,7 @@ static const struct lxc_devs lxc_devs[] = {
...
@@ -1112,7 +1112,7 @@ static const struct lxc_devs lxc_devs[] = {
{
"tty"
,
S_IFCHR
|
S_IRWXU
|
S_IRWXG
|
S_IRWXO
,
5
,
0
},
{
"tty"
,
S_IFCHR
|
S_IRWXU
|
S_IRWXG
|
S_IRWXO
,
5
,
0
},
};
};
static
int
lxc_fill_autodev
(
const
struct
lxc_rootfs
*
rootfs
,
bool
mount_console
)
static
int
lxc_fill_autodev
(
const
struct
lxc_rootfs
*
rootfs
)
{
{
int
ret
;
int
ret
;
char
path
[
MAXPATHLEN
];
char
path
[
MAXPATHLEN
];
...
@@ -3945,13 +3945,11 @@ int lxc_setup(struct lxc_handler *handler)
...
@@ -3945,13 +3945,11 @@ int lxc_setup(struct lxc_handler *handler)
}
}
if
(
lxc_conf
->
autodev
>
0
)
{
if
(
lxc_conf
->
autodev
>
0
)
{
bool
mount_console
=
lxc_conf
->
console
.
path
&&
!
strcmp
(
lxc_conf
->
console
.
path
,
"none"
);
if
(
run_lxc_hooks
(
name
,
"autodev"
,
lxc_conf
,
lxcpath
,
NULL
))
{
if
(
run_lxc_hooks
(
name
,
"autodev"
,
lxc_conf
,
lxcpath
,
NULL
))
{
ERROR
(
"failed to run autodev hooks for container '%s'."
,
name
);
ERROR
(
"failed to run autodev hooks for container '%s'."
,
name
);
return
-
1
;
return
-
1
;
}
}
if
(
lxc_fill_autodev
(
&
lxc_conf
->
rootfs
,
mount_console
))
{
if
(
lxc_fill_autodev
(
&
lxc_conf
->
rootfs
))
{
ERROR
(
"failed to populate /dev in the container"
);
ERROR
(
"failed to populate /dev in the container"
);
return
-
1
;
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