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:
7d76f31
)
mount: also relabel pre-mounted API dirs
author
Lennart Poettering
<lennart@poettering.net>
Thu, 31 Mar 2011 19:40:10 +0000
(21:40 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 31 Mar 2011 19:40:10 +0000
(21:40 +0200)
src/mount-setup.c
patch
|
blob
|
history
diff --git
a/src/mount-setup.c
b/src/mount-setup.c
index 056e4a1c6c016d9d6ab88245220908c3d7b7e02c..49eab0bfa72ef5b148d53f70ae9582415207f351 100644
(file)
--- a/
src/mount-setup.c
+++ b/
src/mount-setup.c
@@
-101,7
+101,7
@@
static int mount_one(const MountPoint *p) {
return r;
if (r > 0)
return r;
if (r > 0)
-
return 0
;
+
goto finish
;
/* The access mode here doesn't really matter too much, since
* the mounted file system will take precedence anyway. */
/* The access mode here doesn't really matter too much, since
* the mounted file system will take precedence anyway. */
@@
-122,6
+122,7
@@
static int mount_one(const MountPoint *p) {
return p->fatal ? -errno : 0;
}
return p->fatal ? -errno : 0;
}
+finish:
label_fix(p->where, false);
return 0;
label_fix(p->where, false);
return 0;