Skip to content

Commit fc80384

Browse files
Yuri Pankovbehlendorf
Yuri Pankov
authored and
behlendorf
committed
Illumos 934 - FreeBSD's GPT not recognized
Reviewed by: Alexander Eremin <alexander.r.eremin@gmail.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com> Reviewed by: Richard Elling <richard.elling@richardelling.com> Approved by: Gordon Ross <gwr@nexenta.com> References: https://www.illumos.org/issues/934 illumos/illumos-gate@e21ea67 Ported-by: ilovezfs <ilovezfs@icloud.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #4016
1 parent b22e279 commit fc80384

File tree

2 files changed

+66
-49
lines changed

2 files changed

+66
-49
lines changed

‎include/sys/efi_partition.h‎

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121
/*
2222
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
23+
* Copyright 2012 Nexenta Systems, Inc. All rights reserved.
2324
*/
2425

2526
#ifndef _SYS_EFI_PARTITION_H
@@ -86,54 +87,64 @@ typedef struct efi_gpe_Attrs {
8687
* 6a945a3b-1dd2-11b2-99a6-080020736631 V_CACHE
8788
*/
8889

89-
#define EFI_UNUSED { 0x00000000, 0x0000, 0x0000, 0x00, 0x00, \
90-
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
91-
#define EFI_RESV1 { 0x6a96237f, 0x1dd2, 0x11b2, 0x99, 0xa6, \
92-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
93-
#define EFI_BOOT { 0x6a82cb45, 0x1dd2, 0x11b2, 0x99, 0xa6, \
94-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
95-
#define EFI_ROOT { 0x6a85cf4d, 0x1dd2, 0x11b2, 0x99, 0xa6, \
96-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
97-
#define EFI_SWAP { 0x6a87c46f, 0x1dd2, 0x11b2, 0x99, 0xa6, \
98-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
99-
#define EFI_USR { 0x6a898cc3, 0x1dd2, 0x11b2, 0x99, 0xa6, \
100-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
101-
#define EFI_BACKUP { 0x6a8b642b, 0x1dd2, 0x11b2, 0x99, 0xa6, \
102-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
103-
#define EFI_RESV2 { 0x6a8d2ac7, 0x1dd2, 0x11b2, 0x99, 0xa6, \
104-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
105-
#define EFI_VAR { 0x6a8ef2e9, 0x1dd2, 0x11b2, 0x99, 0xa6, \
106-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
107-
#define EFI_HOME { 0x6a90ba39, 0x1dd2, 0x11b2, 0x99, 0xa6, \
108-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
109-
#define EFI_ALTSCTR { 0x6a9283a5, 0x1dd2, 0x11b2, 0x99, 0xa6, \
110-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
111-
#define EFI_RESERVED { 0x6a945a3b, 0x1dd2, 0x11b2, 0x99, 0xa6, \
112-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
113-
#define EFI_SYSTEM { 0xC12A7328, 0xF81F, 0x11d2, 0xBA, 0x4B, \
114-
{ 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B } }
115-
#define EFI_LEGACY_MBR { 0x024DEE41, 0x33E7, 0x11d3, 0x9D, 0x69, \
116-
{ 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F } }
117-
#define EFI_SYMC_PUB { 0x6a9630d1, 0x1dd2, 0x11b2, 0x99, 0xa6, \
118-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
119-
#define EFI_SYMC_CDS { 0x6a980767, 0x1dd2, 0x11b2, 0x99, 0xa6, \
120-
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
121-
#define EFI_MSFT_RESV { 0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, \
122-
{ 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE } }
123-
#define EFI_DELL_BASIC { 0xebd0a0a2, 0xb9e5, 0x4433, 0x87, 0xc0, \
124-
{ 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7 } }
125-
#define EFI_DELL_RAID { 0xa19d880f, 0x05fc, 0x4d3b, 0xa0, 0x06, \
126-
{ 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e } }
127-
#define EFI_DELL_SWAP { 0x0657fd6d, 0xa4ab, 0x43c4, 0x84, 0xe5, \
128-
{ 0x09, 0x33, 0xc8, 0x4b, 0x4f, 0x4f } }
129-
#define EFI_DELL_LVM { 0xe6d6d379, 0xf507, 0x44c2, 0xa2, 0x3c, \
130-
{ 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28 } }
131-
#define EFI_DELL_RESV { 0x8da63339, 0x0007, 0x60c0, 0xc4, 0x36, \
132-
{ 0x08, 0x3a, 0xc8, 0x23, 0x09, 0x08 } }
133-
#define EFI_AAPL_HFS { 0x48465300, 0x0000, 0x11aa, 0xaa, 0x11, \
134-
{ 0x00, 0x30, 0x65, 0x43, 0xec, 0xac } }
135-
#define EFI_AAPL_UFS { 0x55465300, 0x0000, 0x11aa, 0xaa, 0x11, \
136-
{ 0x00, 0x30, 0x65, 0x43, 0xec, 0xac } }
90+
#define EFI_UNUSED { 0x00000000, 0x0000, 0x0000, 0x00, 0x00, \
91+
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
92+
#define EFI_RESV1 { 0x6a96237f, 0x1dd2, 0x11b2, 0x99, 0xa6, \
93+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
94+
#define EFI_BOOT { 0x6a82cb45, 0x1dd2, 0x11b2, 0x99, 0xa6, \
95+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
96+
#define EFI_ROOT { 0x6a85cf4d, 0x1dd2, 0x11b2, 0x99, 0xa6, \
97+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
98+
#define EFI_SWAP { 0x6a87c46f, 0x1dd2, 0x11b2, 0x99, 0xa6, \
99+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
100+
#define EFI_USR { 0x6a898cc3, 0x1dd2, 0x11b2, 0x99, 0xa6, \
101+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
102+
#define EFI_BACKUP { 0x6a8b642b, 0x1dd2, 0x11b2, 0x99, 0xa6, \
103+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
104+
#define EFI_RESV2 { 0x6a8d2ac7, 0x1dd2, 0x11b2, 0x99, 0xa6, \
105+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
106+
#define EFI_VAR { 0x6a8ef2e9, 0x1dd2, 0x11b2, 0x99, 0xa6, \
107+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
108+
#define EFI_HOME { 0x6a90ba39, 0x1dd2, 0x11b2, 0x99, 0xa6, \
109+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
110+
#define EFI_ALTSCTR { 0x6a9283a5, 0x1dd2, 0x11b2, 0x99, 0xa6, \
111+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
112+
#define EFI_RESERVED { 0x6a945a3b, 0x1dd2, 0x11b2, 0x99, 0xa6, \
113+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
114+
#define EFI_SYSTEM { 0xC12A7328, 0xF81F, 0x11d2, 0xBA, 0x4B, \
115+
{ 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B } }
116+
#define EFI_LEGACY_MBR { 0x024DEE41, 0x33E7, 0x11d3, 0x9D, 0x69, \
117+
{ 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F } }
118+
#define EFI_SYMC_PUB { 0x6a9630d1, 0x1dd2, 0x11b2, 0x99, 0xa6, \
119+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
120+
#define EFI_SYMC_CDS { 0x6a980767, 0x1dd2, 0x11b2, 0x99, 0xa6, \
121+
{ 0x08, 0x00, 0x20, 0x73, 0x66, 0x31 } }
122+
#define EFI_MSFT_RESV { 0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, \
123+
{ 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE } }
124+
#define EFI_DELL_BASIC { 0xebd0a0a2, 0xb9e5, 0x4433, 0x87, 0xc0, \
125+
{ 0x68, 0xb6, 0xb7, 0x26, 0x99, 0xc7 } }
126+
#define EFI_DELL_RAID { 0xa19d880f, 0x05fc, 0x4d3b, 0xa0, 0x06, \
127+
{ 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e } }
128+
#define EFI_DELL_SWAP { 0x0657fd6d, 0xa4ab, 0x43c4, 0x84, 0xe5, \
129+
{ 0x09, 0x33, 0xc8, 0x4b, 0x4f, 0x4f } }
130+
#define EFI_DELL_LVM { 0xe6d6d379, 0xf507, 0x44c2, 0xa2, 0x3c, \
131+
{ 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28 } }
132+
#define EFI_DELL_RESV { 0x8da63339, 0x0007, 0x60c0, 0xc4, 0x36, \
133+
{ 0x08, 0x3a, 0xc8, 0x23, 0x09, 0x08 } }
134+
#define EFI_AAPL_HFS { 0x48465300, 0x0000, 0x11aa, 0xaa, 0x11, \
135+
{ 0x00, 0x30, 0x65, 0x43, 0xec, 0xac } }
136+
#define EFI_AAPL_UFS { 0x55465300, 0x0000, 0x11aa, 0xaa, 0x11, \
137+
{ 0x00, 0x30, 0x65, 0x43, 0xec, 0xac } }
138+
#define EFI_FREEBSD_BOOT { 0x83bd6b9d, 0x7f41, 0x11dc, 0xbe, 0x0b, \
139+
{ 0x00, 0x15, 0x60, 0xb8, 0x4f, 0x0f } }
140+
#define EFI_FREEBSD_SWAP { 0x516e7cb5, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
141+
{ 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
142+
#define EFI_FREEBSD_UFS { 0x516e7cb6, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
143+
{ 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
144+
#define EFI_FREEBSD_VINUM { 0x516e7cb8, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
145+
{ 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
146+
#define EFI_FREEBSD_ZFS { 0x516e7cba, 0x6ecf, 0x11d6, 0x8f, 0xf8, \
147+
{ 0x00, 0x02, 0x2d, 0x09, 0x71, 0x2b } }
137148

138149
/* minimum # of bytes for partition table entires, per EFI spec */
139150
#define EFI_MIN_ARRAY_SIZE (16 * 1024)

‎lib/libefi/rdwr_efi.c‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
/*
2323
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
24+
* Copyright 2012 Nexenta Systems, Inc. All rights reserved.
2425
*/
2526

2627
#include <stdio.h>
@@ -69,7 +70,12 @@ static struct uuid_to_ptag {
6970
{ EFI_DELL_LVM },
7071
{ EFI_DELL_RESV },
7172
{ EFI_AAPL_HFS },
72-
{ EFI_AAPL_UFS }
73+
{ EFI_AAPL_UFS },
74+
{ EFI_FREEBSD_BOOT },
75+
{ EFI_FREEBSD_SWAP },
76+
{ EFI_FREEBSD_UFS },
77+
{ EFI_FREEBSD_VINUM },
78+
{ EFI_FREEBSD_ZFS }
7379
};
7480

7581
/*

0 commit comments

Comments
 (0)