From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 13 May 2022 03:30:04 +0000 (+0900)
Subject: core/mount: set Mount.from_proc_self_mountinfo flag before adding default dependencies
X-Git-Tag: v252-rc1~512^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9e6d23dfc93b0eab8762c6fbe4fddc9eeb0c04f;p=thirdparty%2Fsystemd.git

core/mount: set Mount.from_proc_self_mountinfo flag before adding default dependencies

When the function mount_setup_new_unit() is called, the corresponding
.mount unit file is not loaded. Hence, Mount.from_fragment is false.
To add default dependencies to e.g. .device units, it is necessary that
the Mount.from_proc_self_mountinfo flag is set. However, the flag was
not set even the unit has information from /proc/self/mountinfo.

Partially fixes #19983.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 4263610e828..229b3de4fd2 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1600,15 +1600,15 @@ static int mount_setup_new_unit(
         if (r < 0)
                 return r;
 
-        r = mount_add_non_exec_dependencies(MOUNT(u));
-        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;
 
+        r = mount_add_non_exec_dependencies(MOUNT(u));
+        if (r < 0)
+                return r;
+
         /* 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);