diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2020-09-22 16:24:59 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@microsoft.com> | 2020-09-22 16:24:59 +0200 |
| commit | c848516f3f3356d52cbc10eb270f531d48820648 (patch) | |
| tree | ff12417ddd1fc747cf701a89bff5fbdcdd845253 /src/shared/dissect-image.c | |
| parent | dissect-image: use correct path variable when reading verity signatures (diff) | |
| download | systemd-c848516f3f3356d52cbc10eb270f531d48820648.tar.xz systemd-c848516f3f3356d52cbc10eb270f531d48820648.zip | |
dissect-image: do not refuse verity GPT without /usr partition
Only enforce that /usr verity partition is present if a /usr
partition is there
Diffstat (limited to '')
| -rw-r--r-- | src/shared/dissect-image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 8947da8102..3a2200f91e 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -956,7 +956,7 @@ int dissect_image( return -EADDRNOTAVAIL; /* Combinations of verity /usr with verity-less root is OK, but the reverse is not */ - if (m->partitions[PARTITION_ROOT_VERITY].found && !m->partitions[PARTITION_USR_VERITY].found) + if (m->partitions[PARTITION_ROOT_VERITY].found && m->partitions[PARTITION_USR].found && !m->partitions[PARTITION_USR_VERITY].found) return -EADDRNOTAVAIL; if (verity && verity->root_hash) { |