From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 15 Feb 2023 05:23:34 +0000 (+0900)
Subject: core/mount: fix default target for /sysusr/usr and its child
X-Git-Tag: v254-rc1~1265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbfc096095cb741f5345be0dc6508628008c46d7;p=thirdparty%2Fsystemd.git

core/mount: fix default target for /sysusr/usr and its child

Follow-up for 29a24ab28e9790680348b1ffab653a321fa49a67.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index f47c511da60..993dce5118e 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -490,6 +490,10 @@ static int mount_add_default_ordering_dependencies(Mount *m, MountParameters *p,
                 after = NULL;
                 before = isempty(e) ? SPECIAL_INITRD_ROOT_FS_TARGET : SPECIAL_INITRD_FS_TARGET;
 
+        } else if (in_initrd() && path_startswith(m->where, "/sysusr/usr")) {
+                after = NULL;
+                before = SPECIAL_INITRD_USR_FS_TARGET;
+
         } else if (mount_is_network(p)) {
                 after = SPECIAL_REMOTE_FS_PRE_TARGET;
                 before = SPECIAL_REMOTE_FS_TARGET;