chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
992f87e
)
mount-setup: consider a few file systems API mounts and ignore them
author
Lennart Poettering
<lennart@poettering.net>
Fri, 16 Jul 2010 00:56:57 +0000
(
02:56
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 16 Jul 2010 00:56:57 +0000
(
02:56
+0200)
src/mount-setup.c
patch
|
blob
|
history
diff --git
a/src/mount-setup.c
b/src/mount-setup.c
index 33e6f4fa0e570f63de56d2d43324173f255b6dde..6b0539bf97cf8f6041d46044889e8b6065bf842c 100644
(file)
--- 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 },
};
{ "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;
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;
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/");
}
return path_startswith(path, "/cgroup/");
}