summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSangjung Woo <sangjung.woo@samsung.com>2015-10-21 21:48:13 +0900
committerSangjung Woo <sangjung.woo@samsung.com>2015-10-24 20:54:21 +0900
commit5dfcb8d20021c8fc555a86c4fbbc72d5c9837150 (patch)
tree1d9dbb238d24543bfe9e8f6a7fb0d40a814ba7b9
parent46a01abae985024572ec860bd02ca7f1fe458096 (diff)
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.
-rw-r--r--Makefile.am3
-rw-r--r--units/tmp.mount.m4 (renamed from units/tmp.mount)3
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index fa25485b73..89eaf80575 100644
--- 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
index 00a0d28722..e1e26bdfc0 100644
--- 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