dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-09 09:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

shared: Remove remaining usages of GPT_ROOT_NATIVE, GPT_USR_NATIVE from dissect-image.c

Browse Source 
Follow-up for 49ae9d91f9

Fixes #21843
This commit is contained in:
Daan De Meyer
2021-12-21 11:13:10 +01:00
committed by Luca Boccassi
parent 77ec2816c6
commit 9519b41e52
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -627,12 +627,8 @@ int dissect_image(
DissectedImage **ret) {
#if HAVE_BLKID
#ifdef GPT_ROOT_NATIVE
sd_id128_t root_uuid = SD_ID128_NULL, root_verity_uuid = SD_ID128_NULL;
#endif
#ifdef GPT_USR_NATIVE
sd_id128_t usr_uuid = SD_ID128_NULL, usr_verity_uuid = SD_ID128_NULL;
#endif
bool is_gpt, is_mbr, multiple_generic = false,
generic_rw = false, /* initialize to appease gcc */
generic_growfs = false;
@@ -682,19 +678,13 @@ int dissect_image(
/* If the verity data declares it's for the /usr partition, then search for that, in all
* other cases assume it's for the root partition. */
#ifdef GPT_USR_NATIVE
if (verity->designator == PARTITION_USR) {
usr_uuid = fsuuid;
usr_verity_uuid = vuuid;
} else {
#endif
#ifdef GPT_ROOT_NATIVE
root_uuid = fsuuid;
root_verity_uuid = vuuid;
#endif
#ifdef GPT_USR_NATIVE
}
#endif
}
if (fstat(fd, &st) < 0)