diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
| commit | 8bb05ac73a5b448b339ce0bc8d396c82c459b47f (patch) | |
| tree | 1fdda006866bca20d41cb206767ea5241e36852f /libfdisk/src/gpt.c | |
| parent | Adding debian version 2.39.3-11. (diff) | |
| download | util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.tar.xz util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.zip | |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libfdisk/src/gpt.c')
| -rw-r--r-- | libfdisk/src/gpt.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c index c3c0347..1c19d86 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c @@ -152,19 +152,20 @@ struct gpt_legacy_mbr { .name = (_n), \ } -static struct fdisk_parttype gpt_parttypes[] = +static const struct fdisk_parttype gpt_parttypes[] = { #include "pt-gpt-partnames.h" }; static const struct fdisk_shortcut gpt_parttype_cuts[] = { - { .shortcut = "L", .alias = "linux", .data = "0FC63DAF-8483-4772-8E79-3D69D8477DE4" }, /* Linux */ - { .shortcut = "S", .alias = "swap", .data = "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F" }, /* Swap */ - { .shortcut = "H", .alias = "home", .data = "933AC7E1-2EB4-4F13-B844-0E14E2AEF915" }, /* Home */ - { .shortcut = "U", .alias = "uefi", .data = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" }, /* UEFI system */ - { .shortcut = "R", .alias = "raid", .data = "A19D880F-05FC-4D3B-A006-743F0F84911E" }, /* Linux RAID */ - { .shortcut = "V", .alias = "lvm", .data = "E6D6D379-F507-44C2-A23C-238F2A3DF928" } /* LVM */ + { .shortcut = "L", .alias = "linux", .data = "0FC63DAF-8483-4772-8E79-3D69D8477DE4" }, /* Linux */ + { .shortcut = "S", .alias = "swap", .data = "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F" }, /* Swap */ + { .shortcut = "H", .alias = "home", .data = "933AC7E1-2EB4-4F13-B844-0E14E2AEF915" }, /* Home */ + { .shortcut = "U", .alias = "uefi", .data = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" }, /* UEFI system */ + { .shortcut = "R", .alias = "raid", .data = "A19D880F-05FC-4D3B-A006-743F0F84911E" }, /* Linux RAID */ + { .shortcut = "V", .alias = "lvm", .data = "E6D6D379-F507-44C2-A23C-238F2A3DF928" }, /* LVM */ + { .shortcut = "X", .alias = "xbootldr", .data = "BC13C2FF-59E6-4262-A352-B275FD6F7172" }, /* Linux extended boot */ }; #define alignment_required(_x) ((_x)->grain != (_x)->sector_size) @@ -3322,8 +3323,12 @@ void fdisk_gpt_enable_minimize(struct fdisk_label *lb, int enable) } #ifdef TEST_PROGRAM -static int test_getattr(struct fdisk_test *ts, int argc, char *argv[]) +static int test_getattr(struct fdisk_test *ts __attribute__((unused)), + int argc, char *argv[]) { + if (argc != 3) + return -1; + const char *disk = argv[1]; size_t part = strtoul(argv[2], NULL, 0) - 1; struct fdisk_context *cxt; @@ -3344,8 +3349,12 @@ static int test_getattr(struct fdisk_test *ts, int argc, char *argv[]) return 0; } -static int test_setattr(struct fdisk_test *ts, int argc, char *argv[]) +static int test_setattr(struct fdisk_test *ts __attribute__((unused)), + int argc, char *argv[]) { + if (argc != 4) + return -1; + const char *disk = argv[1]; size_t part = strtoul(argv[2], NULL, 0) - 1; uint64_t atters = strtoull(argv[3], NULL, 0); |