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 | |
| parent | 590a23de524073336a1499d1de34534390253c32 (diff) | |
| parent | 409c2a13fd65692c611b7bcaba12e908ef7cf1e5 (diff) | |
Merge pull request #1572 from again4you/devel/tmp-smack
units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | units/tmp.mount.m4 (renamed from units/tmp.mount) | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 8ba4e0e389..205f2a4d8d 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..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') |