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
69eadddb
Unverified
Commit
69eadddb
authored
Jul 18, 2018
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conf: the atime flags are locked in userns
This means they need to be added for remount and for fresh mounts. Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
c77abb20
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
11 deletions
+21
-11
conf.c
src/lxc/conf.c
+21
-11
No files found.
src/lxc/conf.c
View file @
69eadddb
...
@@ -609,9 +609,6 @@ unsigned long add_required_remount_flags(const char *s, const char *d,
...
@@ -609,9 +609,6 @@ unsigned long add_required_remount_flags(const char *s, const char *d,
struct
statvfs
sb
;
struct
statvfs
sb
;
unsigned
long
required_flags
=
0
;
unsigned
long
required_flags
=
0
;
if
(
!
(
flags
&
MS_REMOUNT
))
return
flags
;
if
(
!
s
)
if
(
!
s
)
s
=
d
;
s
=
d
;
...
@@ -622,14 +619,27 @@ unsigned long add_required_remount_flags(const char *s, const char *d,
...
@@ -622,14 +619,27 @@ unsigned long add_required_remount_flags(const char *s, const char *d,
if
(
ret
<
0
)
if
(
ret
<
0
)
return
flags
;
return
flags
;
if
(
sb
.
f_flag
&
MS_NOSUID
)
if
(
flags
&
MS_REMOUNT
)
{
required_flags
|=
MS_NOSUID
;
if
(
sb
.
f_flag
&
MS_NOSUID
)
if
(
sb
.
f_flag
&
MS_NODEV
)
required_flags
|=
MS_NOSUID
;
required_flags
|=
MS_NODEV
;
if
(
sb
.
f_flag
&
MS_NODEV
)
if
(
sb
.
f_flag
&
MS_RDONLY
)
required_flags
|=
MS_NODEV
;
required_flags
|=
MS_RDONLY
;
if
(
sb
.
f_flag
&
MS_RDONLY
)
if
(
sb
.
f_flag
&
MS_NOEXEC
)
required_flags
|=
MS_RDONLY
;
required_flags
|=
MS_NOEXEC
;
if
(
sb
.
f_flag
&
MS_NOEXEC
)
required_flags
|=
MS_NOEXEC
;
}
if
(
sb
.
f_flag
&
MS_NOATIME
)
required_flags
|=
MS_NOATIME
;
if
(
sb
.
f_flag
&
MS_NODIRATIME
)
required_flags
|=
MS_NODIRATIME
;
if
(
sb
.
f_flag
&
MS_LAZYTIME
)
required_flags
|=
MS_LAZYTIME
;
if
(
sb
.
f_flag
&
MS_RELATIME
)
required_flags
|=
MS_RELATIME
;
if
(
sb
.
f_flag
&
MS_STRICTATIME
)
required_flags
|=
MS_STRICTATIME
;
return
flags
|
required_flags
;
return
flags
|
required_flags
;
#else
#else
...
...
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