]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mount-setup: exclude /run/nextroot/ from relabelling
authorLennart Poettering <lennart@poettering.net>
Fri, 2 Jun 2023 15:50:50 +0000 (17:50 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 2 Jun 2023 16:43:10 +0000 (18:43 +0200)
Just like /run/initramfs/ the data in /run/nextroot/ should be a
self-contained OS tree, and not require labelling, hence don't.

src/shared/mount-setup.c

index fd14cd85985e0862218f61b751f269d387f55c12..ede4e8483a10aaecea6268fa1c309fbf9d64e8b1 100644 (file)
@@ -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_;