From: Kay Sievers <kay@vrfy.org>
Date: Sun, 18 Oct 2015 10:19:08 +0000 (+0200)
Subject: Revert "units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled"
X-Git-Tag: v228~189
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29a3f0d4c56ebc4c4f13e1d4a5c279da13629b59;p=platform%2Fupstream%2Fsystemd.git

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.
---

diff --git a/Makefile.am b/Makefile.am
index 205f2a4..8ba4e0e 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
similarity index 85%
rename from units/tmp.mount.m4
rename to units/tmp.mount
index d537746..00a0d28 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