From: Philippe De Swert <philippedesw...@gmail.com>
Smack mounts /run with some different parameters, we definitely
do not want to have a second mount over it afterwards
Signed-off-by: Philippe De Swert <philippedesw...@gmail.com>
---
src/core/mount-setup.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index cc2633e..f87390b 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -93,9 +93,10 @@ static const MountPoint mount_table[] = {
#ifdef HAVE_SMACK
{ "tmpfs", "/run", "tmpfs",
"mode=755,smackfsroot=*", MS_NOSUID|MS_NODEV|MS_STRICTATIME,
use_smack, MNT_FATAL },
-#endif
+#else
{ "tmpfs", "/run", "tmpfs", "mode=755",
MS_NOSUID|MS_NODEV|MS_STRICTATIME,
NULL, MNT_FATAL|MNT_IN_CONTAINER },
+#endif
{ "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755",
MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME,
NULL, MNT_FATAL|MNT_IN_CONTAINER },
{ "cgroup", "/sys/fs/cgroup/systemd", "cgroup",
"none,name=systemd,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV,
--
1.8.1.2
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
