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
4d6cc24c
Unverified
Commit
4d6cc24c
authored
May 02, 2018
by
Liza Tretyakova
Committed by
Christian Brauner
Jul 22, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
start: add shmount setup on container start
Signed-off-by:
Liza Tretyakova
<
elizabet.tretyakova@gmail.com
>
parent
f6310f18
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
83 additions
and
0 deletions
+83
-0
start.c
src/lxc/start.c
+83
-0
No files found.
src/lxc/start.c
View file @
4d6cc24c
...
...
@@ -1529,6 +1529,70 @@ static inline int do_share_ns(void *arg)
return
0
;
}
static
int
lxc_setup_shmount
(
struct
lxc_conf
*
conf
)
{
size_t
len_cont
;
char
*
full_cont_path
;
int
ret
=
-
1
;
/* Construct the shmount path under the container root */
/* +1 for slash */
len_cont
=
strlen
(
conf
->
rootfs
.
mount
)
+
1
+
strlen
(
conf
->
lxc_shmount
.
path_cont
);
/* +1 for the terminating '\0' */
full_cont_path
=
malloc
(
len_cont
+
1
);
if
(
!
full_cont_path
)
{
SYSERROR
(
"Not enough memory"
);
return
-
ENOMEM
;
}
ret
=
snprintf
(
full_cont_path
,
len_cont
+
1
,
"%s/%s"
,
conf
->
rootfs
.
mount
,
conf
->
lxc_shmount
.
path_cont
);
if
(
ret
<
0
||
ret
>=
len_cont
+
1
)
{
SYSERROR
(
"Failed to create filename"
);
free
(
full_cont_path
);
return
-
1
;
}
/* Check if shmount point is already set up */
if
(
is_shared_mountpoint
(
conf
->
lxc_shmount
.
path_host
))
{
INFO
(
"Path
\"
%s
\"
is already MS_SHARED. Reusing"
,
conf
->
lxc_shmount
.
path_host
);
free
(
full_cont_path
);
return
0
;
}
/* Create host and cont mount paths */
ret
=
mkdir_p
(
conf
->
lxc_shmount
.
path_host
,
0711
);
if
(
ret
<
0
&&
errno
!=
EEXIST
)
{
SYSERROR
(
"Failed to create directory
\"
%s
\"
"
,
conf
->
lxc_shmount
.
path_host
);
free
(
full_cont_path
);
return
ret
;
}
ret
=
mkdir_p
(
full_cont_path
,
0711
);
if
(
ret
<
0
&&
errno
!=
EEXIST
)
{
SYSERROR
(
"Failed to create directory
\"
%s
\"
"
,
full_cont_path
);
free
(
full_cont_path
);
return
ret
;
}
/* Prepare host mountpoint */
ret
=
mount
(
"tmpfs"
,
conf
->
lxc_shmount
.
path_host
,
"tmpfs"
,
0
,
"size=100k,mode=0711"
);
if
(
ret
<
0
)
{
SYSERROR
(
"Failed to mount
\"
%s
\"
"
,
conf
->
lxc_shmount
.
path_host
);
free
(
full_cont_path
);
return
ret
;
}
ret
=
mount
(
conf
->
lxc_shmount
.
path_host
,
conf
->
lxc_shmount
.
path_host
,
"none"
,
MS_REC
|
MS_SHARED
,
""
);
if
(
ret
<
0
)
{
SYSERROR
(
"Failed to make shared
\"
%s
\"
"
,
conf
->
lxc_shmount
.
path_host
);
free
(
full_cont_path
);
return
ret
;
}
INFO
(
"Made shared mount point
\"
%s
\"
"
,
conf
->
lxc_shmount
.
path_host
);
free
(
full_cont_path
);
return
0
;
}
/* lxc_spawn() performs crucial setup tasks and clone()s the new process which
* exec()s the requested container binary.
* Note that lxc_spawn() runs in the parent namespaces. Any operations performed
...
...
@@ -1606,6 +1670,25 @@ static int lxc_spawn(struct lxc_handler *handler)
}
}
if
(
conf
->
lxc_shmount
.
path_host
&&
!
conf
->
lxc_shmount
.
path_cont
)
{
ERROR
(
"Missing the container side path to the shared mount point"
);
lxc_sync_fini
(
handler
);
return
-
1
;
}
if
(
conf
->
lxc_shmount
.
path_host
)
{
ret
=
lxc_setup_shmount
(
conf
);
if
(
ret
<
0
)
{
ERROR
(
"Failed to setup shared mount point"
);
lxc_sync_fini
(
handler
);
return
-
1
;
}
}
if
(
!
cgroup_init
(
handler
))
{
ERROR
(
"Failed initializing cgroup support"
);
goto
out_delete_net
;
}
if
(
!
cgroup_ops
->
create
(
cgroup_ops
,
handler
))
{
ERROR
(
"Failed creating cgroups"
);
goto
out_delete_net
;
...
...
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