summaryrefslogtreecommitdiffstats
path: root/src/sysusers
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2024-02-28 22:04:58 +0100
committerGitHub <noreply@github.com>2024-02-28 22:04:58 +0100
commit5b97957376ba647ee6c92c940c79751e87a65471 (patch)
treed6d943815fd39f44d2f708c17f4e025c45aa455d /src/sysusers
parentMerge pull request #31524 from poettering/secure-getenv-naming-fix (diff)
parentdissect: condition usespace verity keyring via kernel cmdline option + env var (diff)
downloadsystemd-5b97957376ba647ee6c92c940c79751e87a65471.tar.xz
systemd-5b97957376ba647ee6c92c940c79751e87a65471.zip
Merge pull request #31531 from poettering/verity-userspace-optional
dissect: make use of userspace verity keyring optional
Diffstat (limited to 'src/sysusers')
-rw-r--r--src/sysusers/sysusers.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index e443b10211..89e957822a 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -2247,7 +2247,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);