summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2015-10-18 12:19:08 +0200
committerKay Sievers <kay@vrfy.org>2015-10-18 12:21:21 +0200
commit29a3f0d4c56ebc4c4f13e1d4a5c279da13629b59 (patch)
tree2661ab907111fb156020c055253b67cab1978fbe /units
parent606601ddcac15f5ade4f6840fd04d6f26acce2f4 (diff)
Revert "units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled"
This reverts commit 409c2a13fd65692c611b7bcaba12e908ef7cf1e5. It breaks the bootup of systems which enable smack at compile time, but have no smack enabled in the kernel. This needs a different solution.
Diffstat (limited to 'units')
-rw-r--r--units/tmp.mount (renamed from units/tmp.mount.m4)4
1 files changed, 1 insertions, 3 deletions
diff --git a/units/tmp.mount.m4 b/units/tmp.mount
index d537746dbf..00a0d28722 100644
--- a/units/tmp.mount.m4
+++ b/units/tmp.mount
@@ -18,6 +18,4 @@ Before=local-fs.target umount.target
What=tmpfs
Where=/tmp
Type=tmpfs
-m4_ifdef(`HAVE_SMACK',
-`Options=mode=1777,strictatime,smackfsroot=*',
-`Options=mode=1777,strictatime')
+Options=mode=1777,strictatime