Attachment #84916 for bug #120990

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

Lines 275-280 Link Here

(-)src.new/sbin/gpt/gpt.c (+6 lines)
275	return (0);	275	return (0);
276	}	276	}
277	break;	277	break;
		278	if (strcmp(s, "bios_boot") == 0) {
		279	uuid_t bios_boot = GPT_ENT_TYPE_BIOS_BOOT;
		280	*uuid = bios_boot;
		281	return (0);
		282	}
		283	break;
278	case 'e':	284	case 'e':
279	if (strcmp(s, "efi") == 0) {	285	if (strcmp(s, "efi") == 0) {
280	uuid_t efi = GPT_ENT_TYPE_EFI;	286	uuid_t efi = GPT_ENT_TYPE_EFI;

Lines 55-60 Link Here

(-)src.new/sbin/gpt/show.c (+3 lines)
55	friendly(uuid_t *t)	55	friendly(uuid_t *t)
56	{	56	{
57	static uuid_t boot = GPT_ENT_TYPE_FREEBSD_BOOT;	57	static uuid_t boot = GPT_ENT_TYPE_FREEBSD_BOOT;
		58	static uuid_t bios_boot = GPT_ENT_TYPE_BIOS_BOOT;
58	static uuid_t efi_slice = GPT_ENT_TYPE_EFI;	59	static uuid_t efi_slice = GPT_ENT_TYPE_EFI;
59	static uuid_t mslinux = GPT_ENT_TYPE_MS_BASIC_DATA;	60	static uuid_t mslinux = GPT_ENT_TYPE_MS_BASIC_DATA;
60	static uuid_t freebsd = GPT_ENT_TYPE_FREEBSD;	61	static uuid_t freebsd = GPT_ENT_TYPE_FREEBSD;
Lines 75-80 Link Here
75	return ("EFI System");	76	return ("EFI System");
76	if (uuid_equal(t, &boot, NULL))	77	if (uuid_equal(t, &boot, NULL))
77	return ("FreeBSD boot");	78	return ("FreeBSD boot");
		79	if (uuid_equal(t, &bios_boot, NULL))
		80	return ("BIOS boot");
78	if (uuid_equal(t, &swap, NULL))	81	if (uuid_equal(t, &swap, NULL))
79	return ("FreeBSD swap");	82	return ("FreeBSD swap");
80	if (uuid_equal(t, &ufs, NULL))	83	if (uuid_equal(t, &ufs, NULL))

Lines 120-123 Link Here

(-)src.new/sys/sys/gpt.h (+7 lines)
120	#define GPT_ENT_TYPE_APPLE_HFS \	120	#define GPT_ENT_TYPE_APPLE_HFS \
121	{0x48465300,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}	121	{0x48465300,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
122		122
		123	/*
		124	* Same functionality as GPT_ENT_TYPE_FREEBSD_BOOT. Used for others such as
		125	* GRUB 2, but aimed at standarization.
		126	*/
		127	#define GPT_ENT_TYPE_BIOS_BOOT \
		128	{0x21686148,0x6449,0x6e6f,0x74,0x4e,{0x65,0x65,0x64,0x45,0x46,0x49}}
		129
123	#endif /* _SYS_GPT_H_ */	130	#endif /* _SYS_GPT_H_ */

Return to bug 120990