shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-01 08:58:29 +03:00
Code

Revert "units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled"

Browse Source 
This reverts commit 409c2a13fd65692c611b7bcaba12e908ef7cf1e5.

It breaks the bootup of systems which enable smack at compile time, but have no
smack enabled in the kernel. This needs a different solution.
This commit is contained in:
Kay Sievers 2015-10-18 12:19:08 +02:00
parent 606601ddca
commit 29a3f0d4c5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -616,8 +616,7 @@ 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/tmp.mount.m4
units/systemd-update-done.service.in
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \

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

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