File 0008-mount-setup-fix-counting-of-early-mounts-w... of Package systemd-mini

Overview Repositories Revisions Requests Users Attributes Meta

File 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch of Package systemd-mini

From 7c96ab1d2484ab2df3c6a84f1a1d2e076f469085 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 13 Aug 2014 20:01:19 +0200
Subject: [PATCH] mount-setup: fix counting of early mounts without SMACK

http://lists.freedesktop.org/archives/systemd-devel/2014-August/021772.html
---
 src/core/mount-setup.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git src/core/mount-setup.c src/core/mount-setup.c
index 206f89a..cc2633e 100644
--- src/core/mount-setup.c
+++ 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,
-- 
1.7.9.2

Places

File 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch of Package systemd-mini

Places