chiark / gitweb /
core: don't try to relabel mounts before we loaded the policy
authorLennart Poettering <lennart@poettering.net>
Mon, 24 Mar 2014 20:04:02 +0000 (21:04 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 24 Mar 2014 20:04:02 +0000 (21:04 +0100)
src/core/mount-setup.c

index 147333a..0a45b24 100644 (file)
@@ -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,