mirror of
https://github.com/systemd/systemd.git
synced 2025-08-25 13:49:55 +03:00
mute the memory recursiveprot log if version of kernel is low.
This commit is contained in:
committed by
Lennart Poettering
parent
1db8c86196
commit
556c674d6e
@ -61,6 +61,21 @@ typedef struct MountPoint {
|
||||
#define N_EARLY_MOUNT 4
|
||||
#endif
|
||||
|
||||
static bool check_recursiveprot_supported(void) {
|
||||
int r;
|
||||
|
||||
if (!cg_is_unified_wanted())
|
||||
return false;
|
||||
|
||||
r = mount_option_supported("cgroup2", "memory_recursiveprot", NULL);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to determiner whether the 'memory_recursiveprot' mount option is supported, assuming not: %m");
|
||||
else if (r == 0)
|
||||
log_debug("This kernel version does not support 'memory_recursiveprot', not using mount option.");
|
||||
|
||||
return r > 0;
|
||||
}
|
||||
|
||||
static const MountPoint mount_table[] = {
|
||||
{ "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
|
||||
NULL, MNT_FATAL|MNT_IN_CONTAINER|MNT_FOLLOW_SYMLINK },
|
||||
@ -87,7 +102,7 @@ static const MountPoint mount_table[] = {
|
||||
{ "tmpfs", "/run", "tmpfs", "mode=0755" TMPFS_LIMITS_RUN, MS_NOSUID|MS_NODEV|MS_STRICTATIME,
|
||||
NULL, MNT_FATAL|MNT_IN_CONTAINER },
|
||||
{ "cgroup2", "/sys/fs/cgroup", "cgroup2", "nsdelegate,memory_recursiveprot", MS_NOSUID|MS_NOEXEC|MS_NODEV,
|
||||
cg_is_unified_wanted, MNT_IN_CONTAINER|MNT_CHECK_WRITABLE },
|
||||
check_recursiveprot_supported, MNT_IN_CONTAINER|MNT_CHECK_WRITABLE },
|
||||
{ "cgroup2", "/sys/fs/cgroup", "cgroup2", "nsdelegate", MS_NOSUID|MS_NOEXEC|MS_NODEV,
|
||||
cg_is_unified_wanted, MNT_IN_CONTAINER|MNT_CHECK_WRITABLE },
|
||||
{ "cgroup2", "/sys/fs/cgroup", "cgroup2", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
|
||||
|
Reference in New Issue
Block a user