SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24709 from keszybz/partition-table-constants

Browse Source 
Expose various GPT UUIDs as public contants and link them up in docs
This commit is contained in:
Lennart Poettering
2022-09-21 20:07:21 +02:00
committed by GitHub
parent df4bed3f92 ed1cf1d970
commit 4d0d34b4e7
34 changed files with 805 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-loop-block.c
+4 -4
View File
@@ -111,7 +111,7 @@ static void* thread_func(void *ptr) {
#endif
static bool have_root_gpt_type(void) {
#ifdef GPT_ROOT_NATIVE
#ifdef SD_GPT_ROOT_NATIVE
return true;
#else
return false;
@@ -202,10 +202,10 @@ static int run(int argc, char *argv[]) {
"size=32M, type=0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
"size=32M, type=", sfdisk);
#ifdef GPT_ROOT_NATIVE
fprintf(sfdisk, SD_ID128_UUID_FORMAT_STR, SD_ID128_FORMAT_VAL(GPT_ROOT_NATIVE));
#ifdef SD_GPT_ROOT_NATIVE
fprintf(sfdisk, SD_ID128_UUID_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_GPT_ROOT_NATIVE));
#else
fprintf(sfdisk, SD_ID128_UUID_FORMAT_STR, SD_ID128_FORMAT_VAL(GPT_ROOT_X86_64));
fprintf(sfdisk, SD_ID128_UUID_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_GPT_ROOT_X86_64));
#endif
fputs("\n"