From 4647e869227bec6c495194ed4e49061c141d4a6c Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 15 Feb 2023 14:23:34 +0900
Subject: [PATCH] core/mount: fix default target for /sysusr/usr and its child

Follow-up for 29a24ab28e9790680348b1ffab653a321fa49a67.

(cherry picked from commit dbfc096095cb741f5345be0dc6508628008c46d7)
(cherry picked from commit a3177cbe546537c873d477138014d054b1cc6376)
(cherry picked from commit 6e8d76f776b02eadfa6e4575f516866786fd3817)
---
 src/core/mount.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/mount.c b/src/core/mount.c
index b1a3d972d5..b563e3d964 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -473,6 +473,10 @@ static int mount_add_default_ordering_dependencies(
                 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;