diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-21 11:13:10 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2021-12-21 13:47:07 +0000 |
| commit | 9519b41e529bc904b159acb87bdf84231599776b (patch) | |
| tree | 6ee0a7578cdfb132418ea4f98aa07986dfb3b661 /src/shared/dissect-image.c | |
| parent | 77ec2816c6814957138fde72571aa22e5988b0a4 (diff) | |
| download | systemd-9519b41e529bc904b159acb87bdf84231599776b.tar.gz | |
shared: Remove remaining usages of GPT_ROOT_NATIVE, GPT_USR_NATIVE from dissect-image.c
Follow-up for 49ae9d91f9ba68bf3f1a6928152a5969d329bbc2
Fixes #21843
Diffstat (limited to 'src/shared/dissect-image.c')
| -rw-r--r-- | src/shared/dissect-image.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 4c553f4d2e..39a7f4c3f2 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -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) |