picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dissect: assume GPT_ROOT_SECONDARY_VERITY is defined when GPT_ROOT_SECONDARY is 

We define those macros, and there's no reason to have one without
the other.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-12-10 13:35:47 -05:00
parent b7cac52779
commit 4f8b86e307
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/shared/dissect-image.c
View File

@ -372,9 +372,7 @@ int dissect_image(int fd, const void *root_hash, size_t root_hash_size, Dissecte
designator = PARTITION_ROOT;
architecture = native_architecture();
rw = !(flags & GPT_FLAG_READ_ONLY);
}
#ifdef GPT_ROOT_NATIVE_VERITY
else if (sd_id128_equal(type_id, GPT_ROOT_NATIVE_VERITY)) {
} else if (sd_id128_equal(type_id, GPT_ROOT_NATIVE_VERITY)) {
m->can_verity = true;
@ -388,7 +386,6 @@ int dissect_image(int fd, const void *root_hash, size_t root_hash_size, Dissecte
rw = false;
}
#endif
#endif
#ifdef GPT_ROOT_SECONDARY
else if (sd_id128_equal(type_id, GPT_ROOT_SECONDARY)) {
@ -399,9 +396,7 @@ int dissect_image(int fd, const void *root_hash, size_t root_hash_size, Dissecte
designator = PARTITION_ROOT_SECONDARY;
architecture = SECONDARY_ARCHITECTURE;
rw = !(flags & GPT_FLAG_READ_ONLY);
}
#ifdef GPT_ROOT_SECONDARY_VERITY
else if (sd_id128_equal(type_id, GPT_ROOT_SECONDARY_VERITY)) {
} else if (sd_id128_equal(type_id, GPT_ROOT_SECONDARY_VERITY)) {
m->can_verity = true;
@ -414,7 +409,6 @@ int dissect_image(int fd, const void *root_hash, size_t root_hash_size, Dissecte
architecture = SECONDARY_ARCHITECTURE;
rw = false;
}
#endif
#endif
else if (sd_id128_equal(type_id, GPT_SWAP)) {
designator = PARTITION_SWAP;