diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-03-09 22:58:08 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-03-16 14:57:27 +0100 |
| commit | d04faa4e191ac851ca08fbfda0efa89c4087cc99 (patch) | |
| tree | fa4987bf22805c73fecf1f28127da148fbb8fb2d /src/sysext | |
| parent | dissect-image: support images without rootfs but with /usr/ (diff) | |
| download | systemd-d04faa4e191ac851ca08fbfda0efa89c4087cc99.tar.xz systemd-d04faa4e191ac851ca08fbfda0efa89c4087cc99.zip | |
tree-wide: make use of DISSECT_IMAGE_USR_NO_ROOT in various tools
Let's make use of the new dissection in all tools where this makes
sense, which are all tools that dissect images, except for those which
inherently operate on state/configuraiton and thus where an image
without state nor configuration is useless (e.g.
systemd-tmpfiles/systemd-firstboot/… --image= switch).
Diffstat (limited to 'src/sysext')
| -rw-r--r-- | src/sysext/sysext.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index 9b1c4908a4..2ebb96c397 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -509,7 +509,11 @@ static int merge_subprocess(Hashmap *images, const char *workspace) { _cleanup_(loop_device_unrefp) LoopDevice *d = NULL; _cleanup_(decrypted_image_unrefp) DecryptedImage *di = NULL; _cleanup_(verity_settings_done) VeritySettings verity_settings = VERITY_SETTINGS_DEFAULT; - DissectImageFlags flags = DISSECT_IMAGE_READ_ONLY|DISSECT_IMAGE_REQUIRE_ROOT|DISSECT_IMAGE_MOUNT_ROOT_ONLY; + DissectImageFlags flags = + DISSECT_IMAGE_READ_ONLY| + DISSECT_IMAGE_REQUIRE_ROOT| + DISSECT_IMAGE_MOUNT_ROOT_ONLY| + DISSECT_IMAGE_USR_NO_ROOT; r = verity_settings_load(&verity_settings, img->path, NULL, NULL); if (r < 0) |