shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

Merge pull request #1572 from again4you/devel/tmp-smack

Browse Source 
units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled
This commit is contained in:
Lennart Poettering 2015-10-15 13:09:57 +02:00
commit 2ac3f19a51
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -616,7 +616,8 @@ EXTRA_DIST += \
units/initrd-udevadm-cleanup-db.service.in \ units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \ units/initrd-switch-root.service.in \
units/systemd-nspawn@.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 if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \ nodist_systemunit_DATA += \

4
units/tmp.mount → units/tmp.mount.m4
View File

@ -18,4 +18,6 @@ Before=local-fs.target umount.target
What=tmpfs What=tmpfs
Where=/tmp Where=/tmp
Type=tmpfs Type=tmpfs
Options=mode=1777,strictatime m4_ifdef(`HAVE_SMACK',
`Options=mode=1777,strictatime,smackfsroot=*',
`Options=mode=1777,strictatime')