diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 18:09:39 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 18:11:07 +0200 |
| commit | 1b9c1e51bb74ade4c517537d6d02ba7e404fc900 (patch) | |
| tree | f205716e492ff5ad49f550d550cc44508a317a53 /src/core | |
| parent | a485a218fb4fc1baa0b279314b737ea0e36aa397 (diff) | |
Prep v233: Add missing updates from upstream in src/core
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/mount-setup.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index d8140bea9..6c6669af1 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -110,19 +110,18 @@ static const MountPoint mount_table[] = { { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV, cg_is_legacy_wanted, MNT_IN_CONTAINER }, { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, -#else - { "cgroup", "/sys/fs/cgroup/elogind", "cgroup", "none,name=elogind,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV, - cg_is_legacy_wanted, MNT_IN_CONTAINER }, - { "cgroup", "/sys/fs/cgroup/elogind", "cgroup", "none,name=elogind", MS_NOSUID|MS_NOEXEC|MS_NODEV, -#endif // 0 - cg_is_legacy_wanted, MNT_IN_CONTAINER }, -#if 0 /// UNNEEDED by elogind + cg_is_legacy_wanted, MNT_FATAL|MNT_IN_CONTAINER }, { "pstore", "/sys/fs/pstore", "pstore", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL, MNT_NONE }, #ifdef ENABLE_EFI { "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, is_efi_boot, MNT_NONE }, #endif +#else + { "cgroup", "/sys/fs/cgroup/elogind", "cgroup", "none,name=elogind,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV, + cg_is_legacy_wanted, MNT_IN_CONTAINER }, + { "cgroup", "/sys/fs/cgroup/elogind", "cgroup", "none,name=elogind", MS_NOSUID|MS_NOEXEC|MS_NODEV, + cg_is_legacy_wanted, MNT_FATAL|MNT_IN_CONTAINER }, #endif // 0 }; |