summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-24 21:04:02 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-24 21:04:02 +0100
commitc4bfd1691f4d3e26d6d7f34dbca941e119956e8a (patch)
tree6be6fa4f17fd484cfc6a526d0ddded39a1aa80bc
parent07a062a79374406e8f6b5a1e2f80c80baf031567 (diff)
core: don't try to relabel mounts before we loaded the policy
-rw-r--r--src/core/mount-setup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 147333a6c6..0a45b24774 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -172,7 +172,10 @@ static int mount_one(const MountPoint *p, bool relabel) {
/* The access mode here doesn't really matter too much, since
* the mounted file system will take precedence anyway. */
- mkdir_p_label(p->where, 0755);
+ if (relabel)
+ mkdir_p_label(p->where, 0755);
+ else
+ mkdir_p(p->where, 0755);
log_debug("Mounting %s to %s of type %s with options %s.",
p->what,