chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop_duplicates: copy full BindMount struct
[elogind.git]
/
src
/
core
/
namespace.c
diff --git
a/src/core/namespace.c
b/src/core/namespace.c
index 1d0f740afab5d1ebe8ee64484c9674b473e0454f..fe9537787185c6755f9778593ae5aa393d760e7a 100644
(file)
--- a/
src/core/namespace.c
+++ b/
src/core/namespace.c
@@
-124,8
+124,7
@@
static void drop_duplicates(BindMount *m, unsigned *n) {
if (previous && path_equal(f->path, previous->path))
continue;
if (previous && path_equal(f->path, previous->path))
continue;
- t->path = f->path;
- t->mode = f->mode;
+ *t = *f;
previous = t;
previous = t;
@@
-334,7
+333,7
@@
static int make_read_only(BindMount *m) {
if (IN_SET(m->mode, INACCESSIBLE, READONLY))
r = bind_remount_recursive(m->path, true);
if (IN_SET(m->mode, INACCESSIBLE, READONLY))
r = bind_remount_recursive(m->path, true);
- else if (
m->mode == READWRITE
)
+ else if (
IN_SET(m->mode, READWRITE, PRIVATE_TMP, PRIVATE_VAR_TMP, PRIVATE_DEV)
)
r = bind_remount_recursive(m->path, false);
else
r = 0;
r = bind_remount_recursive(m->path, false);
else
r = 0;