]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bootctl: make sure bootctl --image= works on image with /usr/ but without /
authorLennart Poettering <lennart@poettering.net>
Wed, 12 Mar 2025 20:56:36 +0000 (21:56 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 13 Mar 2025 09:49:33 +0000 (10:49 +0100)
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.

src/bootctl/bootctl.c

index ebb4749d17de3a35b2f07c06eedd8427ae7f2d3e..0a7893224c74ca3dc00259a175af9d22ecfed35c 100644 (file)
@@ -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,