diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-10-18 12:19:08 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-10-18 12:21:21 +0200 |
| commit | 29a3f0d4c56ebc4c4f13e1d4a5c279da13629b59 (patch) | |
| tree | 2661ab907111fb156020c055253b67cab1978fbe | |
| parent | 606601ddcac15f5ade4f6840fd04d6f26acce2f4 (diff) | |
Revert "units: add 'smackfsroot=*' option into tmp.mount when SMACK is enabled"
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.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | units/tmp.mount (renamed from units/tmp.mount.m4) | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 205f2a4d8d..8ba4e0e389 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 += \ diff --git a/units/tmp.mount.m4 b/units/tmp.mount index d537746dbf..00a0d28722 100644 --- a/units/tmp.mount.m4 +++ b/units/tmp.mount @@ -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 |