units: add 'SmackFileSystemRoot=*' option into tmp.mount

If SMACK is enabled, 'smackfsroot=*' option should be specified when
/tmp is mounted since many non-root processes use /tmp for temporary
usage. If not, /tmp is labeled as '_' and smack denial occurs when
writing.

In order to do that, 'SmackFileSystemRoot=*' is newly added into
tmp.mount.

diff --git a/Makefile.am b/Makefile.am
index fa25485b7363b8b62aa5886022da60c48040ab16..89eaf805753c5d410bdef346ef790e179da2bae4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -616,7 +616,8 @@ 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/systemd-update-done.service.in \
+    units/tmp.mount.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \

diff --git a/units/tmp.mount b/units/tmp.mount.m4
similarity index 92%
rename from units/tmp.mount
rename to units/tmp.mount.m4
index 00a0d28722449038f17e6aa66cb6c70def0cf9f8..e1e26bdfc0d93edd6b8c455e9ce7cf890cc48047 100644 (file)
--- a/units/tmp.mount
+++ b/units/tmp.mount.m4
@@ -19,3 +19,6 @@ What=tmpfs
 Where=/tmp
 Type=tmpfs
 Options=mode=1777,strictatime
+m4_ifdef(`HAVE_SMACK',
+SmackFileSystemRoot=*
+)m4_dnl