X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount-setup.c;h=6b0539bf97cf8f6041d46044889e8b6065bf842c;hp=33e6f4fa0e570f63de56d2d43324173f255b6dde;hb=9d25f5ed7b80df732cf7842985aa9b243bcd2335;hpb=f5644ae461dfed81fc1eb1212a15992be13b80fd

diff --git a/src/mount-setup.c b/src/mount-setup.c
index 33e6f4fa0..6b0539bf9 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -51,6 +51,16 @@ static const MountPoint mount_table[] = {
         { "cgroup",   "/cgroup/systemd", "cgroup",   "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
 };
 
+/* These are API file systems that might be mounted by other software,
+ * we just list them here so that we know that we should igore them */
+
+static const char * const ignore_paths[] = {
+        "/selinux",
+        "/proc/bus/usb",
+        "/var/lib/nfs/rpc_pipefs",
+        "/proc/fs/nfsd"
+};
+
 bool mount_point_is_api(const char *path) {
         unsigned i;
 
@@ -61,6 +71,10 @@ bool mount_point_is_api(const char *path) {
                 if (path_startswith(path, mount_table[i].where))
                         return true;
 
+        for (i = 0; i < ELEMENTSOF(ignore_paths); i++)
+                if (path_startswith(path, ignore_paths[i]))
+                        return true;
+
         return path_startswith(path, "/cgroup/");
 }