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
5f5df0dc
Unverified
Commit
5f5df0dc
authored
Apr 25, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conf: s/lxc_rootfs_prepare/lxc_rootfs_init/g
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
16fca125
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
conf.c
src/lxc/conf.c
+1
-1
conf.h
src/lxc/conf.h
+1
-0
start.c
src/lxc/start.c
+1
-1
No files found.
src/lxc/conf.c
View file @
5f5df0dc
...
@@ -527,7 +527,7 @@ void lxc_storage_put(struct lxc_conf *conf)
...
@@ -527,7 +527,7 @@ void lxc_storage_put(struct lxc_conf *conf)
* no name pollution is happens.
* no name pollution is happens.
* don't unlink on NFS to avoid random named stale handles.
* don't unlink on NFS to avoid random named stale handles.
*/
*/
int
lxc_rootfs_
prepare
(
struct
lxc_conf
*
conf
,
bool
userns
)
int
lxc_rootfs_
init
(
struct
lxc_conf
*
conf
,
bool
userns
)
{
{
__do_close
int
dfd_path
=
-
EBADF
,
fd_pin
=
-
EBADF
,
fd_userns
=
-
EBADF
;
__do_close
int
dfd_path
=
-
EBADF
,
fd_pin
=
-
EBADF
,
fd_userns
=
-
EBADF
;
int
ret
;
int
ret
;
...
...
src/lxc/conf.h
View file @
5f5df0dc
...
@@ -505,6 +505,7 @@ __hidden extern void lxc_conf_free(struct lxc_conf *conf);
...
@@ -505,6 +505,7 @@ __hidden extern void lxc_conf_free(struct lxc_conf *conf);
__hidden
extern
int
lxc_storage_prepare
(
struct
lxc_conf
*
conf
);
__hidden
extern
int
lxc_storage_prepare
(
struct
lxc_conf
*
conf
);
__hidden
extern
int
lxc_rootfs_prepare
(
struct
lxc_conf
*
conf
,
bool
userns
);
__hidden
extern
int
lxc_rootfs_prepare
(
struct
lxc_conf
*
conf
,
bool
userns
);
__hidden
extern
void
lxc_storage_put
(
struct
lxc_conf
*
conf
);
__hidden
extern
void
lxc_storage_put
(
struct
lxc_conf
*
conf
);
__hidden
extern
int
lxc_rootfs_init
(
struct
lxc_conf
*
conf
,
bool
userns
);
__hidden
extern
int
lxc_map_ids
(
struct
lxc_list
*
idmap
,
pid_t
pid
);
__hidden
extern
int
lxc_map_ids
(
struct
lxc_list
*
idmap
,
pid_t
pid
);
__hidden
extern
int
lxc_create_tty
(
const
char
*
name
,
struct
lxc_conf
*
conf
);
__hidden
extern
int
lxc_create_tty
(
const
char
*
name
,
struct
lxc_conf
*
conf
);
__hidden
extern
void
lxc_delete_tty
(
struct
lxc_tty_info
*
ttys
);
__hidden
extern
void
lxc_delete_tty
(
struct
lxc_tty_info
*
ttys
);
...
...
src/lxc/start.c
View file @
5f5df0dc
...
@@ -2034,7 +2034,7 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
...
@@ -2034,7 +2034,7 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
* it readonly.
* it readonly.
* If the container is unprivileged then skip rootfs pinning.
* If the container is unprivileged then skip rootfs pinning.
*/
*/
ret
=
lxc_rootfs_
prepare
(
conf
,
!
lxc_list_empty
(
&
conf
->
id_map
));
ret
=
lxc_rootfs_
init
(
conf
,
!
lxc_list_empty
(
&
conf
->
id_map
));
if
(
ret
)
{
if
(
ret
)
{
ERROR
(
"Failed to handle rootfs pinning for container
\"
%s
\"
"
,
handler
->
name
);
ERROR
(
"Failed to handle rootfs pinning for container
\"
%s
\"
"
,
handler
->
name
);
ret
=
-
1
;
ret
=
-
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