summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-04-11 22:18:55 +0200
committerKay Sievers <kay@vrfy.org>2012-04-11 22:18:55 +0200
commit635f7d8ca723615b4cf968670d58c109b806bb20 (patch)
tree427f64e244138d870ce60a103e315ef8393b73d9
parente5f3d1ba124f14477d6b5434982d7d44a472a66f (diff)
enable proper access timestamps on all tmpfs mounts
-rw-r--r--src/mount-setup.c8
-rw-r--r--src/nspawn.c4
-rw-r--r--units/tmp.mount2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mount-setup.c b/src/mount-setup.c
index 7d6cdf6cb4..dd7938ebe7 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -59,12 +59,12 @@ typedef struct MountPoint {
static const MountPoint mount_table[] = {
{ "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
{ "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
- { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID, true },
+ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true },
{ "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
- { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV, true },
+ { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true },
{ "devpts", "/dev/pts", "devpts", "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false },
- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true },
- { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
+ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true },
+ { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, false },
{ "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, false },
};
diff --git a/src/nspawn.c b/src/nspawn.c
index 9e21c5e8b5..8c4f49a1ed 100644
--- a/src/nspawn.c
+++ b/src/nspawn.c
@@ -145,9 +145,9 @@ static int mount_all(const char *dest) {
{ "/proc/sys", "/proc/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */
{ "/sys", "/sys", "bind", NULL, MS_BIND, true }, /* Bind mount first */
{ "/sys", "/sys", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, true }, /* Then, make it r/o */
- { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID, true },
+ { "tmpfs", "/dev", "tmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME, true },
{ "/dev/pts", "/dev/pts", "bind", NULL, MS_BIND, true },
- { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV, true },
+ { "tmpfs", "/run", "tmpfs", "mode=755", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true },
#ifdef HAVE_SELINUX
{ "/sys/fs/selinux", "/sys/fs/selinux", "bind", NULL, MS_BIND, false }, /* Bind mount first */
{ "/sys/fs/selinux", "/sys/fs/selinux", "bind", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, false }, /* Then, make it r/o */
diff --git a/units/tmp.mount b/units/tmp.mount
index 8d0b8afb17..de3ec1b657 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -13,4 +13,4 @@ Before=local-fs.target
What=tmpfs
Where=/tmp
Type=tmpfs
-Options=mode=1777
+Options=mode=1777,strictatime