From 29a3f0d4c56ebc4c4f13e1d4a5c279da13629b59 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 18 Oct 2015 12:19:08 +0200 Subject: 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. --- units/tmp.mount | 21 +++++++++++++++++++++ units/tmp.mount.m4 | 23 ----------------------- 2 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 units/tmp.mount delete mode 100644 units/tmp.mount.m4 (limited to 'units') 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 diff --git a/units/tmp.mount.m4 b/units/tmp.mount.m4 deleted file mode 100644 index d537746dbf..0000000000 --- a/units/tmp.mount.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# 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 -m4_ifdef(`HAVE_SMACK', -`Options=mode=1777,strictatime,smackfsroot=*', -`Options=mode=1777,strictatime') -- cgit v1.2.3-54-g00ecf