summaryrefslogtreecommitdiff
path: root/Makefile.am
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 /Makefile.am
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 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 1 insertions, 2 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 += \