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
48e5dcc8
Unverified
Commit
48e5dcc8
authored
Feb 08, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conf: don't pass struct lxc_conf
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
8183f09e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
conf.c
src/lxc/conf.c
+4
-6
No files found.
src/lxc/conf.c
View file @
48e5dcc8
...
@@ -2220,8 +2220,7 @@ static inline void __auto_endmntent__(FILE **f)
...
@@ -2220,8 +2220,7 @@ static inline void __auto_endmntent__(FILE **f)
#define __do_endmntent __attribute__((__cleanup__(__auto_endmntent__)))
#define __do_endmntent __attribute__((__cleanup__(__auto_endmntent__)))
static
int
setup_mount_fstab
(
const
struct
lxc_conf
*
conf
,
static
int
setup_mount_fstab
(
struct
lxc_rootfs
*
rootfs
,
const
char
*
fstab
,
struct
lxc_rootfs
*
rootfs
,
const
char
*
fstab
,
const
char
*
lxc_name
,
const
char
*
lxc_path
)
const
char
*
lxc_name
,
const
char
*
lxc_path
)
{
{
__do_endmntent
FILE
*
f
=
NULL
;
__do_endmntent
FILE
*
f
=
NULL
;
...
@@ -2311,9 +2310,8 @@ FILE *make_anonymous_mount_file(struct lxc_list *mount,
...
@@ -2311,9 +2310,8 @@ FILE *make_anonymous_mount_file(struct lxc_list *mount,
}
}
static
int
setup_mount_entries
(
const
struct
lxc_conf
*
conf
,
static
int
setup_mount_entries
(
const
struct
lxc_conf
*
conf
,
struct
lxc_rootfs
*
rootfs
,
struct
lxc_rootfs
*
rootfs
,
struct
lxc_list
*
mount
,
struct
lxc_list
*
mount
,
const
char
*
lxc_name
,
const
char
*
lxc_name
,
const
char
*
lxc_path
)
const
char
*
lxc_path
)
{
{
__do_fclose
FILE
*
f
=
NULL
;
__do_fclose
FILE
*
f
=
NULL
;
...
@@ -3382,7 +3380,7 @@ int lxc_setup(struct lxc_handler *handler)
...
@@ -3382,7 +3380,7 @@ int lxc_setup(struct lxc_handler *handler)
if
(
ret
<
0
)
if
(
ret
<
0
)
return
log_error
(
-
1
,
"Failed to setup first automatic mounts"
);
return
log_error
(
-
1
,
"Failed to setup first automatic mounts"
);
ret
=
setup_mount_fstab
(
lxc_conf
,
&
lxc_conf
->
rootfs
,
lxc_conf
->
fstab
,
name
,
lxcpath
);
ret
=
setup_mount_fstab
(
&
lxc_conf
->
rootfs
,
lxc_conf
->
fstab
,
name
,
lxcpath
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
log_error
(
-
1
,
"Failed to setup mounts"
);
return
log_error
(
-
1
,
"Failed to setup mounts"
);
...
...
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