diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-10-15 13:09:57 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-10-15 13:09:57 +0200 |
commit | 2ac3f19a51869fdecb5edd55372123a8a6400c3c (patch) | |
tree | 3f21a5cca75b4c17f81be73b3bef44e5e9a61ec1 /units | |
parent | Merge pull request #1569 from mustrumr/date-parse-additions (diff) | |
parent | units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled (diff) | |
download | systemd-2ac3f19a51869fdecb5edd55372123a8a6400c3c.tar.xz systemd-2ac3f19a51869fdecb5edd55372123a8a6400c3c.zip |
Merge pull request #1572 from again4you/devel/tmp-smack
units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled
Diffstat (limited to 'units')
-rw-r--r-- | units/tmp.mount.m4 (renamed from units/tmp.mount) | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/units/tmp.mount b/units/tmp.mount.m4 index 00a0d28722..d537746dbf 100644 --- a/units/tmp.mount +++ b/units/tmp.mount.m4 @@ -18,4 +18,6 @@ Before=local-fs.target umount.target What=tmpfs Where=/tmp Type=tmpfs -Options=mode=1777,strictatime +m4_ifdef(`HAVE_SMACK', +`Options=mode=1777,strictatime,smackfsroot=*', +`Options=mode=1777,strictatime') |