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 /units/tmp.mount | |
| parent | Merge pull request #1595 from poettering/proxy-fixes (diff) | |
| download | systemd-29a3f0d4c56ebc4c4f13e1d4a5c279da13629b59.tar.xz systemd-29a3f0d4c56ebc4c4f13e1d4a5c279da13629b59.zip | |
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.
Diffstat (limited to 'units/tmp.mount')
| -rw-r--r-- | units/tmp.mount | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/units/tmp.mount b/units/tmp.mount new file mode 100644 index 0000000000..00a0d28722 --- /dev/null +++ b/units/tmp.mount @@ -0,0 +1,21 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Temporary Directory +Documentation=man:hier(7) +Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems +ConditionPathIsSymbolicLink=!/tmp +DefaultDependencies=no +Conflicts=umount.target +Before=local-fs.target umount.target + +[Mount] +What=tmpfs +Where=/tmp +Type=tmpfs +Options=mode=1777,strictatime |