From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Nov 2018 13:51:04 +0000 (+0100)
Subject: mount: when allocating a Mount object based on /proc/self/mountinfo mark it so
X-Git-Tag: v240~112^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d7e89b07065b8c49af47aaf1ccc336d017fc3a2;p=thirdparty%2Fsystemd.git

mount: when allocating a Mount object based on /proc/self/mountinfo mark it so

Let's set 'from_proc_self_mountinfo' right away, since we know its from
there. This is important so that when the load queue is dispatched (and
thus mount_load() called) this
fact is already known.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 6a0bc1075e6..599e3b24fe6 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1487,6 +1487,13 @@ static int mount_setup_new_unit(
         if (r < 0)
                 return r;
 
+        /* This unit was generated because /proc/self/mountinfo reported it. Remember this, so that by the time we load
+         * the unit file for it (and thus add in extra deps right after) we know what source to attributes the deps
+         * to.*/
+        MOUNT(u)->from_proc_self_mountinfo = true;
+
+        /* We have only allocated the stub now, let's enqueue this unit for loading now, so that everything else is
+         * loaded in now. */
         unit_add_to_load_queue(u);
 
         flags->is_mounted = true;