From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 2 Jun 2023 15:50:50 +0000 (+0200)
Subject: mount-setup: exclude /run/nextroot/ from relabelling
X-Git-Tag: v254-rc1~298^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d58506562407a6b224326cae52cdb369f8bf756c;p=thirdparty%2Fsystemd.git

mount-setup: exclude /run/nextroot/ from relabelling

Just like /run/initramfs/ the data in /run/nextroot/ should be a
self-contained OS tree, and not require labelling, hence don't.
---

diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index fd14cd85985..ede4e8483a1 100644
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -376,8 +376,9 @@ static int relabel_cb(
                 return RECURSE_DIR_CONTINUE;
 
         case RECURSE_DIR_ENTER:
-                /* /run/initramfs is static data and big, no need to dynamically relabel its contents at boot... */
-                if (path_equal(path, "/run/initramfs"))
+                /* /run/initramfs/ + /run/nextroot/ are static data and big, no need to dynamically relabel
+                 * its contents at boot... */
+                if (PATH_STARTSWITH_SET(path, "/run/initramfs", "/run/nextroot"))
                         return RECURSE_DIR_SKIP_ENTRY;
 
                 _fallthrough_;