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
a370f16b
Unverified
Commit
a370f16b
authored
Feb 04, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conf: start stashing dfd to host's / during container setup
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
86087bd6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
conf.c
src/lxc/conf.c
+7
-0
conf.h
src/lxc/conf.h
+1
-0
No files found.
src/lxc/conf.c
View file @
a370f16b
...
@@ -2612,6 +2612,7 @@ struct lxc_conf *lxc_conf_init(void)
...
@@ -2612,6 +2612,7 @@ struct lxc_conf *lxc_conf_init(void)
new
->
rootfs
.
managed
=
true
;
new
->
rootfs
.
managed
=
true
;
new
->
rootfs
.
mntpt_fd
=
-
EBADF
;
new
->
rootfs
.
mntpt_fd
=
-
EBADF
;
new
->
rootfs
.
dev_mntpt_fd
=
-
EBADF
;
new
->
rootfs
.
dev_mntpt_fd
=
-
EBADF
;
new
->
rootfs
.
dfd_root_host
=
-
EBADF
;
new
->
logfd
=
-
1
;
new
->
logfd
=
-
1
;
lxc_list_init
(
&
new
->
cgroup
);
lxc_list_init
(
&
new
->
cgroup
);
lxc_list_init
(
&
new
->
cgroup2
);
lxc_list_init
(
&
new
->
cgroup2
);
...
@@ -3184,6 +3185,10 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
...
@@ -3184,6 +3185,10 @@ int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
{
{
int
ret
;
int
ret
;
conf
->
rootfs
.
dfd_root_host
=
open_at
(
-
EBADF
,
"/"
,
PROTECT_OPATH_DIRECTORY
,
PROTECT_LOOKUP_ABSOLUTE
,
0
);
if
(
conf
->
rootfs
.
dfd_root_host
<
0
)
return
log_error_errno
(
-
errno
,
errno
,
"Failed to open
\"
/
\"
"
);
if
(
conf
->
rootfs_setup
)
{
if
(
conf
->
rootfs_setup
)
{
const
char
*
path
=
conf
->
rootfs
.
mount
;
const
char
*
path
=
conf
->
rootfs
.
mount
;
...
@@ -3514,6 +3519,7 @@ int lxc_setup(struct lxc_handler *handler)
...
@@ -3514,6 +3519,7 @@ int lxc_setup(struct lxc_handler *handler)
close_prot_errno_disarm
(
lxc_conf
->
rootfs
.
mntpt_fd
)
close_prot_errno_disarm
(
lxc_conf
->
rootfs
.
mntpt_fd
)
close_prot_errno_disarm
(
lxc_conf
->
rootfs
.
dev_mntpt_fd
)
close_prot_errno_disarm
(
lxc_conf
->
rootfs
.
dev_mntpt_fd
)
close_prot_errno_disarm
(
lxc_conf
->
rootfs
.
dfd_root_host
)
NOTICE
(
"The container
\"
%s
\"
is set up"
,
name
);
NOTICE
(
"The container
\"
%s
\"
is set up"
,
name
);
return
0
;
return
0
;
...
@@ -3879,6 +3885,7 @@ void lxc_conf_free(struct lxc_conf *conf)
...
@@ -3879,6 +3885,7 @@ void lxc_conf_free(struct lxc_conf *conf)
free
(
conf
->
rootfs
.
data
);
free
(
conf
->
rootfs
.
data
);
close_prot_errno_disarm
(
conf
->
rootfs
.
mntpt_fd
);
close_prot_errno_disarm
(
conf
->
rootfs
.
mntpt_fd
);
close_prot_errno_disarm
(
conf
->
rootfs
.
dev_mntpt_fd
);
close_prot_errno_disarm
(
conf
->
rootfs
.
dev_mntpt_fd
);
close_prot_errno_disarm
(
conf
->
rootfs
.
dfd_root_host
);
free
(
conf
->
logfile
);
free
(
conf
->
logfile
);
if
(
conf
->
logfd
!=
-
1
)
if
(
conf
->
logfd
!=
-
1
)
close
(
conf
->
logfd
);
close
(
conf
->
logfd
);
...
...
src/lxc/conf.h
View file @
a370f16b
...
@@ -194,6 +194,7 @@ struct lxc_tty_info {
...
@@ -194,6 +194,7 @@ struct lxc_tty_info {
* @dev_mntpt_fd : fd for /dev of the container
* @dev_mntpt_fd : fd for /dev of the container
*/
*/
struct
lxc_rootfs
{
struct
lxc_rootfs
{
int
dfd_root_host
;
int
mntpt_fd
;
int
mntpt_fd
;
int
dev_mntpt_fd
;
int
dev_mntpt_fd
;
char
*
path
;
char
*
path
;
...
...
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