From 3dbd2254c5b7677dc0aa03ce1809f024b8a44788 Mon Sep 17 00:00:00 2001

From: Kay Sievers <kay@vrfy.org>

Date: Wed, 11 Apr 2012 22:18:55 +0200

Subject: [PATCH] enable proper access timestamps on all tmpfs mounts (cherry

 picked from commit

 635f7d8ca723615b4cf968670d58c109b806bb20)

Conflicts:

	src/mount-setup.c

	units/media.mount

---

 src/mount-setup.c |    8 ++++----

 src/nspawn.c      |    4 ++--

 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mount-setup.c b/src/mount-setup.c

index 7c14ea8..97ff9df 100644

--- a/src/mount-setup.c

+++ b/src/mount-setup.c

@@ -57,11 +57,11 @@ 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 },

-        { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NODEV,           true },

+        { "devtmpfs", "/dev",                   "devtmpfs", "mode=755",          MS_NOSUID|MS_STRICTATIME,     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 97efcd1..73bd18f 100644

--- a/src/nspawn.c

+++ b/src/nspawn.c

@@ -142,9 +142,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 */