From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 12 Mar 2025 20:56:36 +0000 (+0100)
Subject: bootctl: make sure bootctl --image= works on image with /usr/ but without /
X-Git-Tag: v258-rc1~1086^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=742e26ba20f9362539a4bc30e26ff49e9ec83a87;p=thirdparty%2Fsystemd.git

bootctl: make sure bootctl --image= works on image with /usr/ but without /

Let's make sure we can use the tool on ParticleOS images. They have no
root fs by default (until they are instantiated), but always have /usr/.
Hence add DISSECT_IMAGE_USR_NO_ROOT which has the desired effect.
---

diff --git a/src/bootctl/bootctl.c b/src/bootctl/bootctl.c
index ebb4749d17d..0a7893224c7 100644
--- a/src/bootctl/bootctl.c
+++ b/src/bootctl/bootctl.c
@@ -718,6 +718,7 @@ static int run(int argc, char *argv[]) {
                                 arg_image,
                                 arg_image_policy,
                                 DISSECT_IMAGE_GENERIC_ROOT |
+                                DISSECT_IMAGE_USR_NO_ROOT |
                                 DISSECT_IMAGE_RELAX_VAR_CHECK |
                                 DISSECT_IMAGE_ALLOW_USERSPACE_VERITY,
                                 &mounted_dir,