chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"-" prefix for InaccessibleDirectories and ReadOnlyDirectories
[elogind.git]
/
src
/
core
/
namespace.c
diff --git
a/src/core/namespace.c
b/src/core/namespace.c
index 7e33d84156348497d574308a7557f7e330aa9b7f..16b132ba566327a7b4ed2908fba55d3c887cb2db 100644
(file)
--- a/
src/core/namespace.c
+++ b/
src/core/namespace.c
@@
-51,6
+51,7
@@
typedef struct BindMount {
const char *path;
MountMode mode;
bool done;
const char *path;
MountMode mode;
bool done;
+ bool ignore;
} BindMount;
static int append_mounts(BindMount **p, char **strv, MountMode mode) {
} BindMount;
static int append_mounts(BindMount **p, char **strv, MountMode mode) {
@@
-58,6
+59,13
@@
static int append_mounts(BindMount **p, char **strv, MountMode mode) {
STRV_FOREACH(i, strv) {
STRV_FOREACH(i, strv) {
+ (*p)->ignore = false;
+
+ if ((mode == INACCESSIBLE || mode == READONLY) && (*i)[0] == '-') {
+ (*p)->ignore = true;
+ (*i)++;
+ }
+
if (!path_is_absolute(*i))
return -EINVAL;
if (!path_is_absolute(*i))
return -EINVAL;
@@
-155,6
+163,8
@@
static int apply_mount(
r = mount(what, m->path, NULL, MS_BIND|MS_REC, NULL);
if (r >= 0)
log_debug("Successfully mounted %s to %s", what, m->path);
r = mount(what, m->path, NULL, MS_BIND|MS_REC, NULL);
if (r >= 0)
log_debug("Successfully mounted %s to %s", what, m->path);
+ else if (m->ignore && errno == ENOENT)
+ r = 0;
return r;
}
return r;
}
@@
-168,7
+178,7
@@
static int make_read_only(BindMount *m) {
return 0;
r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL);
return 0;
r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL);
- if (r < 0)
+ if (r < 0
&& !(m->ignore && errno == ENOENT)
)
return -errno;
return 0;
return -errno;
return 0;