summaryrefslogtreecommitdiffstats
path: root/src/machine-id-setup
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2024-02-28 13:17:03 +0100
committerLennart Poettering <lennart@poettering.net>2024-02-28 16:17:40 +0100
commitf4a63ce25f1b672fa2e5b52462ac925bb0027291 (patch)
tree54e4ca1a63ad547e098a06756faea8fa7f18b614 /src/machine-id-setup
parentMerge pull request #31444 from bluca/semaphore (diff)
downloadsystemd-f4a63ce25f1b672fa2e5b52462ac925bb0027291.tar.xz
systemd-f4a63ce25f1b672fa2e5b52462ac925bb0027291.zip
dissect-image: add flag for explicitly enabling userspace verity signature checking
let's make userspace verity signature checking optional. This adds a dissection flag to enable the logic and patches through all our users to enable it by default, thus effectively not changing anything from the status quo ante. However, know we have a knob to turn this off in certain scenarios.
Diffstat (limited to 'src/machine-id-setup')
-rw-r--r--src/machine-id-setup/machine-id-setup-main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 59aad985f8..bbc58945bd 100644
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -156,7 +156,8 @@ static int run(int argc, char *argv[]) {
DISSECT_IMAGE_VALIDATE_OS |
DISSECT_IMAGE_RELAX_VAR_CHECK |
DISSECT_IMAGE_FSCK |
- DISSECT_IMAGE_GROWFS,
+ DISSECT_IMAGE_GROWFS |
+ DISSECT_IMAGE_ALLOW_USERSPACE_VERITY,
&mounted_dir,
/* ret_dir_fd= */ NULL,
&loop_device);