diff options
| author | Toomas Soome <tsoome@me.com> | 2018-10-14 11:16:25 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-10-29 21:09:21 -0400 |
| commit | d06952d085d59072d42d77e29ac5669bbdc25d6e (patch) | |
| tree | 9c1b37f715b6633c9523d40eba7afeaa7957148c /usr/src/lib | |
| parent | 0ff1227b75bfc6aac8def680dc602c3b9fc2bfd4 (diff) | |
| download | illumos-joyent-d06952d085d59072d42d77e29ac5669bbdc25d6e.tar.gz | |
9893 add some partition types
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libefi/common/rdwr_efi.c | 75 |
1 files changed, 43 insertions, 32 deletions
diff --git a/usr/src/lib/libefi/common/rdwr_efi.c b/usr/src/lib/libefi/common/rdwr_efi.c index a878cb50d2..18ad38f0c5 100644 --- a/usr/src/lib/libefi/common/rdwr_efi.c +++ b/usr/src/lib/libefi/common/rdwr_efi.c @@ -44,39 +44,48 @@ #include <sys/byteorder.h> #include <sys/ddi.h> +/* + * The original conversion array used simple array index, but since + * we do need to take account of VTOC tag numbers from other systems, + * we need to provide tag values too, or the array will grow too large. + * + * Still we will fabricate the missing p_tag values. + */ static struct uuid_to_ptag { struct uuid uuid; + ushort_t p_tag; } conversion_array[] = { - { EFI_UNUSED }, - { EFI_BOOT }, - { EFI_ROOT }, - { EFI_SWAP }, - { EFI_USR }, - { EFI_BACKUP }, - { 0 }, /* STAND is never used */ - { EFI_VAR }, - { EFI_HOME }, - { EFI_ALTSCTR }, - { 0 }, /* CACHE is never used */ - { EFI_RESERVED }, - { EFI_SYSTEM }, - { EFI_LEGACY_MBR }, - { EFI_SYMC_PUB }, - { EFI_SYMC_CDS }, - { EFI_MSFT_RESV }, - { EFI_DELL_BASIC }, - { EFI_DELL_RAID }, - { EFI_DELL_SWAP }, - { EFI_DELL_LVM }, - { EFI_DELL_RESV }, - { EFI_AAPL_HFS }, - { EFI_AAPL_UFS }, - { EFI_BIOS_BOOT }, - { EFI_FREEBSD_BOOT }, - { EFI_FREEBSD_SWAP }, - { EFI_FREEBSD_UFS }, - { EFI_FREEBSD_VINUM }, - { EFI_FREEBSD_ZFS } + { EFI_UNUSED, V_UNASSIGNED }, + { EFI_BOOT, V_BOOT }, + { EFI_ROOT, V_ROOT }, + { EFI_SWAP, V_SWAP }, + { EFI_USR, V_USR }, + { EFI_BACKUP, V_BACKUP }, + { EFI_VAR, V_VAR }, + { EFI_HOME, V_HOME }, + { EFI_ALTSCTR, V_ALTSCTR }, + { EFI_RESERVED, V_RESERVED }, + { EFI_SYSTEM, V_SYSTEM }, /* V_SYSTEM is 0xc */ + { EFI_LEGACY_MBR, 0x10 }, + { EFI_SYMC_PUB, 0x11 }, + { EFI_SYMC_CDS, 0x12 }, + { EFI_MSFT_RESV, 0x13 }, + { EFI_DELL_BASIC, 0x14 }, + { EFI_DELL_RAID, 0x15 }, + { EFI_DELL_SWAP, 0x16 }, + { EFI_DELL_LVM, 0x17 }, + { EFI_DELL_RESV, 0x19 }, + { EFI_AAPL_HFS, 0x1a }, + { EFI_AAPL_UFS, 0x1b }, + { EFI_AAPL_ZFS, 0x1c }, + { EFI_AAPL_APFS, 0x1d }, + { EFI_BIOS_BOOT, V_BIOS_BOOT }, /* V_BIOS_BOOT is 0x18 */ + { EFI_FREEBSD_BOOT, V_FREEBSD_BOOT }, + { EFI_FREEBSD_SWAP, V_FREEBSD_SWAP }, + { EFI_FREEBSD_UFS, V_FREEBSD_UFS }, + { EFI_FREEBSD_VINUM, V_FREEBSD_VINUM }, + { EFI_FREEBSD_ZFS, V_FREEBSD_ZFS }, + { EFI_FREEBSD_NANDFS, V_FREEBSD_NANDFS } }; /* @@ -563,7 +572,8 @@ efi_read(int fd, struct dk_gpt *vtoc) if (bcmp(&vtoc->efi_parts[i].p_guid, &conversion_array[j].uuid, sizeof (struct uuid)) == 0) { - vtoc->efi_parts[i].p_tag = j; + vtoc->efi_parts[i].p_tag = + conversion_array[j].p_tag; break; } } @@ -1037,7 +1047,8 @@ efi_write(int fd, struct dk_gpt *vtoc) j < sizeof (conversion_array) / sizeof (struct uuid_to_ptag); j++) { - if (vtoc->efi_parts[i].p_tag == j) { + if (vtoc->efi_parts[i].p_tag == + conversion_array[j].p_tag) { UUID_LE_CONVERT( efi_parts[i].efi_gpe_PartitionTypeGUID, conversion_array[j].uuid); |