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

dissect: don't declare unused variables on archs that have no GPT discovery 

Fixes: #17839
This commit is contained in:
Lennart Poettering 2020-12-03 20:58:00 +01:00
parent 402506cea5
commit 62ea0ed08d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,8 +460,12 @@ int dissect_image(
DissectedImage **ret) { DissectedImage **ret) {
#if HAVE_BLKID #if HAVE_BLKID
sd_id128_t root_uuid = SD_ID128_NULL, root_verity_uuid = SD_ID128_NULL, #ifdef GPT_ROOT_NATIVE
usr_uuid = SD_ID128_NULL, usr_verity_uuid = SD_ID128_NULL; 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, generic_rw, multiple_generic = false; bool is_gpt, is_mbr, generic_rw, multiple_generic = false;
_cleanup_(sd_device_unrefp) sd_device *d = NULL; _cleanup_(sd_device_unrefp) sd_device *d = NULL;
_cleanup_(dissected_image_unrefp) DissectedImage *m = NULL; _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
@ -504,13 +508,19 @@ int dissect_image(
/* If the verity data declares it's for the /usr partition, then search for that, in all /* 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. */ * other cases assume it's for the root partition. */
#ifdef GPT_USR_NATIVE
if (verity->designator == PARTITION_USR) { if (verity->designator == PARTITION_USR) {
usr_uuid = fsuuid; usr_uuid = fsuuid;
usr_verity_uuid = vuuid; usr_verity_uuid = vuuid;
} else { } else {
#endif
#ifdef GPT_ROOT_NATIVE
root_uuid = fsuuid; root_uuid = fsuuid;
root_verity_uuid = vuuid; root_verity_uuid = vuuid;
#endif
#ifdef GPT_USR_NATIVE
} }
#endif
} }
if (fstat(fd, &st) < 0) if (fstat(fd, &st) < 0)