X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmount-setup.c;h=8b4d8c7f4420c0a5de37423ba3e82129b0729845;hb=f1e36d677ac771408e40c34ead368a7fdbcc0622;hp=6b0539bf97cf8f6041d46044889e8b6065bf842c;hpb=949c6510326c8d62bfae9866ebfda9506d0eb755;p=elogind.git diff --git a/src/mount-setup.c b/src/mount-setup.c index 6b0539bf9..8b4d8c7f4 100644 --- a/src/mount-setup.c +++ b/src/mount-setup.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -46,7 +46,7 @@ static const MountPoint mount_table[] = { { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID, true }, { "tmpfs", "/dev/shm", "tmpfs", "mode=1777", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, - { "devpts", "/dev/pts", "devpts", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, false }, + { "devpts", "/dev/pts", "devpts", NULL, MS_NOSUID|MS_NOEXEC, false }, { "tmpfs", "/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, { "cgroup", "/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true }, }; @@ -68,11 +68,11 @@ bool mount_point_is_api(const char *path) { * should be ignored */ for (i = 0; i < ELEMENTSOF(mount_table); i ++) - if (path_startswith(path, mount_table[i].where)) + if (path_equal(path, mount_table[i].where)) return true; for (i = 0; i < ELEMENTSOF(ignore_paths); i++) - if (path_startswith(path, ignore_paths[i])) + if (path_equal(path, ignore_paths[i])) return true; return path_startswith(path, "/cgroup/");