View | Details | Raw Unified | Return to bug 225813
Collapse All | Expand All

(-)./usr/src/sys/geom/part/g_part.c (+1 lines)
Lines 71-76 Link Here
71
	const char *lexeme;
71
	const char *lexeme;
72
	enum g_part_alias alias;
72
	enum g_part_alias alias;
73
} g_part_alias_list[G_PART_ALIAS_COUNT] = {
73
} g_part_alias_list[G_PART_ALIAS_COUNT] = {
74
	{ "apple-apfs", G_PART_ALIAS_APPLE_APFS },
74
	{ "apple-boot", G_PART_ALIAS_APPLE_BOOT },
75
	{ "apple-boot", G_PART_ALIAS_APPLE_BOOT },
75
	{ "apple-core-storage", G_PART_ALIAS_APPLE_CORE_STORAGE },
76
	{ "apple-core-storage", G_PART_ALIAS_APPLE_CORE_STORAGE },
76
	{ "apple-hfs", G_PART_ALIAS_APPLE_HFS },
77
	{ "apple-hfs", G_PART_ALIAS_APPLE_HFS },
(-)./usr/src/sys/geom/part/g_part.h (+1 lines)
Lines 38-43 Link Here
38
#define	G_PART_PROBE_PRI_HIGH	0
38
#define	G_PART_PROBE_PRI_HIGH	0
39
39
40
enum g_part_alias {
40
enum g_part_alias {
41
	G_PART_ALIAS_APPLE_APFS,	/* An Apple APFS partition entry. */
41
	G_PART_ALIAS_APPLE_BOOT,	/* An Apple boot partition entry. */
42
	G_PART_ALIAS_APPLE_BOOT,	/* An Apple boot partition entry. */
42
	G_PART_ALIAS_APPLE_CORE_STORAGE,/* An Apple Core Storage partition. */
43
	G_PART_ALIAS_APPLE_CORE_STORAGE,/* An Apple Core Storage partition. */
43
	G_PART_ALIAS_APPLE_HFS,		/* An HFS+ file system entry. */
44
	G_PART_ALIAS_APPLE_HFS,		/* An HFS+ file system entry. */
(-)./usr/src/sys/geom/part/g_part_gpt.c (+2 lines)
Lines 147-152 Link Here
147
};
147
};
148
G_PART_SCHEME_DECLARE(g_part_gpt);
148
G_PART_SCHEME_DECLARE(g_part_gpt);
149
149
150
static struct uuid gpt_uuid_apple_apfs = GPT_ENT_TYPE_APPLE_APFS;
150
static struct uuid gpt_uuid_apple_boot = GPT_ENT_TYPE_APPLE_BOOT;
151
static struct uuid gpt_uuid_apple_boot = GPT_ENT_TYPE_APPLE_BOOT;
151
static struct uuid gpt_uuid_apple_core_storage =
152
static struct uuid gpt_uuid_apple_core_storage =
152
    GPT_ENT_TYPE_APPLE_CORE_STORAGE;
153
    GPT_ENT_TYPE_APPLE_CORE_STORAGE;
Lines 208-213 Link Here
208
	int alias;
209
	int alias;
209
	int mbrtype;
210
	int mbrtype;
210
} gpt_uuid_alias_match[] = {
211
} gpt_uuid_alias_match[] = {
212
	{ &gpt_uuid_apple_apfs,		G_PART_ALIAS_APPLE_APFS,	 0 },
211
	{ &gpt_uuid_apple_boot,		G_PART_ALIAS_APPLE_BOOT,	 0xab },
213
	{ &gpt_uuid_apple_boot,		G_PART_ALIAS_APPLE_BOOT,	 0xab },
212
	{ &gpt_uuid_apple_core_storage,	G_PART_ALIAS_APPLE_CORE_STORAGE, 0 },
214
	{ &gpt_uuid_apple_core_storage,	G_PART_ALIAS_APPLE_CORE_STORAGE, 0 },
213
	{ &gpt_uuid_apple_hfs,		G_PART_ALIAS_APPLE_HFS,		 0xaf },
215
	{ &gpt_uuid_apple_hfs,		G_PART_ALIAS_APPLE_HFS,		 0xaf },
(-)./usr/src/sys/sys/disk/gpt.h (-2 / +4 lines)
Lines 178-188 Link Here
178
#define	GPT_ENT_TYPE_APPLE_RAID_OFFLINE	\
178
#define	GPT_ENT_TYPE_APPLE_RAID_OFFLINE	\
179
	{0x52414944,0x5f4f,0x11aa,0xaa,0x22,{0x00,0x30,0x65,0x43,0xec,0xac}}
179
	{0x52414944,0x5f4f,0x11aa,0xaa,0x22,{0x00,0x30,0x65,0x43,0xec,0xac}}
180
#define GPT_ENT_TYPE_APPLE_LABEL	\
180
#define GPT_ENT_TYPE_APPLE_LABEL	\
181
    	{0x4C616265,0x6c00,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
181
	{0x4C616265,0x6c00,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
182
#define	GPT_ENT_TYPE_APPLE_TV_RECOVERY	\
182
#define	GPT_ENT_TYPE_APPLE_TV_RECOVERY	\
183
    	{0x5265636f,0x7665,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
183
	{0x5265636f,0x7665,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
184
#define	GPT_ENT_TYPE_APPLE_CORE_STORAGE	\
184
#define	GPT_ENT_TYPE_APPLE_CORE_STORAGE	\
185
	{0x53746f72,0x6167,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
185
	{0x53746f72,0x6167,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
186
#define	GPT_ENT_TYPE_APPLE_APFS		\
187
	{0x7c3457ef,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
186
188
187
#define	GPT_ENT_TYPE_NETBSD_FFS		\
189
#define	GPT_ENT_TYPE_NETBSD_FFS		\
188
	{0x49f48d5a,0xb10e,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}
190
	{0x49f48d5a,0xb10e,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}

Return to bug 225813