summaryrefslogtreecommitdiff
path: root/src/mount-setup.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-11-11 11:15:16 +0100
committerKay Sievers <kay.sievers@vrfy.org>2010-11-11 11:15:16 +0100
commit57f2a956e63d6b981b9d6277ab800ad4ad386f42 (patch)
treea93f3300e2d2bb799bb6490915f7a5d97b93f448 /src/mount-setup.c
parentf54409d8b8a8dd3e43a450be5bbd78afdcb78c25 (diff)
split mount_point_is_api() and mount_point_ignore()
We should not handle the ignore list as API mounts, as systemd itself never touches them. On Thu, Nov 11, 2010 at 10:34, Andreas Jaeger <aj@novell.com> wrote: > > I noticed for some time that systemd-remount-api-vfs is in the > failed state and found now the following in the log files > > systemd-remount-api-vfs[467]: /bin/mount for /proc/bus/usb exited with exit status 32. > systemd-remount-api-vfs[467]: mount: /proc/bus/usb not mounted already, or bad option > systemd[1]: systemd-remount-api-vfs.service: main process exited, code=exited, status=1 > systemd[1]: Unit systemd-remount-api-vfs.service entered failed state.
Diffstat (limited to 'src/mount-setup.c')
-rw-r--r--src/mount-setup.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mount-setup.c b/src/mount-setup.c
index 84a729ebf2..9eb2832c6e 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -74,11 +74,17 @@ bool mount_point_is_api(const char *path) {
if (path_equal(path, mount_table[i].where))
return true;
+ return path_startswith(path, "/sys/fs/cgroup/");
+}
+
+bool mount_point_ignore(const char *path) {
+ unsigned i;
+
for (i = 0; i < ELEMENTSOF(ignore_paths); i++)
if (path_equal(path, ignore_paths[i]))
return true;
- return path_startswith(path, "/sys/fs/cgroup/");
+ return false;
}
static int mount_one(const MountPoint *p) {