summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--units/tmp.mount (renamed from units/tmp.mount.m4)4
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 205f2a4d8d..8ba4e0e389 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -616,8 +616,7 @@ EXTRA_DIST += \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
units/systemd-nspawn@.service.in \
- units/systemd-update-done.service.in \
- units/tmp.mount.m4
+ units/systemd-update-done.service.in
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
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