From d58506562407a6b224326cae52cdb369f8bf756c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 2 Jun 2023 17:50:50 +0200 Subject: [PATCH] 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. --- src/shared/mount-setup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c index fd14cd8598..ede4e8483a 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_;