proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 22:42:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2480 from brauner/2018-07-18/add_required_mount_flags

Browse Source 
conf: the atime flags are locked in userns
This commit is contained in:
Stéphane Graber 2018-07-19 16:18:21 -04:00 committed by GitHub
commit 8fd3e219c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/conf.c
View File

@ -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,6 +619,7 @@ unsigned long add_required_remount_flags(const char *s, const char *d,
if (ret < 0) if (ret < 0)
return flags; return flags;
if (flags & MS_REMOUNT) {
if (sb.f_flag & MS_NOSUID) if (sb.f_flag & MS_NOSUID)
required_flags |= MS_NOSUID; required_flags |= MS_NOSUID;
if (sb.f_flag & MS_NODEV) if (sb.f_flag & MS_NODEV)
@ -630,6 +628,18 @@ unsigned long add_required_remount_flags(const char *s, const char *d,
required_flags |= MS_RDONLY; required_flags |= MS_RDONLY;
if (sb.f_flag & MS_NOEXEC) if (sb.f_flag & MS_NOEXEC)
required_flags |= 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