summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-13 20:01:19 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-13 20:01:21 +0200
commit7c96ab1d2484ab2df3c6a84f1a1d2e076f469085 (patch)
treed24170441009d46d659b43f81ca2ef0ac31fcd29 /src/core
parentf6e81de4947e024d6b66c3abaafd5bb237abc93a (diff)
mount-setup: fix counting of early mounts without SMACK
http://lists.freedesktop.org/archives/systemd-devel/2014-August/021772.html
Diffstat (limited to 'src/core')
-rw-r--r--src/core/mount-setup.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 206f89a30f..cc2633e3bd 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -63,8 +63,13 @@ typedef struct MountPoint {
/* The first three entries we might need before SELinux is up. The
* fourth (securityfs) is needed by IMA to load a custom policy. The
- * other ones we can delay until SELinux and IMA are loaded. */
+ * other ones we can delay until SELinux and IMA are loaded. When
+ * SMACK is enabled we need smackfs, too, so it's a fifth one. */
+#ifdef HAVE_SMACK
#define N_EARLY_MOUNT 5
+#else
+#define N_EARLY_MOUNT 4
+#endif
static const MountPoint mount_table[] = {
{ "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,