Attachment #106974 for bug #147664

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

Lines 51-56 Link Here

(-)sys/geom/part/g_part.h (+1 lines)
51	G_PART_ALIAS_FREEBSD_VINUM, /* A Vinum partition entry. */	51	G_PART_ALIAS_FREEBSD_VINUM, /* A Vinum partition entry. */
52	G_PART_ALIAS_FREEBSD_ZFS, /* A ZFS file system entry. */	52	G_PART_ALIAS_FREEBSD_ZFS, /* A ZFS file system entry. */
53	G_PART_ALIAS_MBR, /* A MBR (extended) partition entry. */	53	G_PART_ALIAS_MBR, /* A MBR (extended) partition entry. */
		54	G_PART_ALIAS_WIN95_FAT32, /* Win95 FAT32 entry */
54	G_PART_ALIAS_LINUX_DATA, /* A Linux data partition entry. */	55	G_PART_ALIAS_LINUX_DATA, /* A Linux data partition entry. */
55	G_PART_ALIAS_LINUX_LVM, /* A Linux LVM partition entry. */	56	G_PART_ALIAS_LINUX_LVM, /* A Linux LVM partition entry. */
56	G_PART_ALIAS_LINUX_RAID, /* A Linux RAID partition entry. */	57	G_PART_ALIAS_LINUX_RAID, /* A Linux RAID partition entry. */

Lines 83-88 Link Here

(-)sys/geom/part/g_part.c (+1 lines)
83	{ "freebsd-ufs", G_PART_ALIAS_FREEBSD_UFS },	83	{ "freebsd-ufs", G_PART_ALIAS_FREEBSD_UFS },
84	{ "freebsd-vinum", G_PART_ALIAS_FREEBSD_VINUM },	84	{ "freebsd-vinum", G_PART_ALIAS_FREEBSD_VINUM },
85	{ "freebsd-zfs", G_PART_ALIAS_FREEBSD_ZFS },	85	{ "freebsd-zfs", G_PART_ALIAS_FREEBSD_ZFS },
		86	{ "win95-fat32", G_PART_ALIAS_WIN95_FAT32 },
86	{ "linux-data", G_PART_ALIAS_LINUX_DATA },	87	{ "linux-data", G_PART_ALIAS_LINUX_DATA },
87	{ "linux-lvm", G_PART_ALIAS_LINUX_LVM },	88	{ "linux-lvm", G_PART_ALIAS_LINUX_LVM },
88	{ "linux-raid", G_PART_ALIAS_LINUX_RAID },	89	{ "linux-raid", G_PART_ALIAS_LINUX_RAID },




		*dp_typ = DOSPTYP_386BSD;
		return (0);
	}

	alias = g_part_alias_name(G_PART_ALIAS_WIN95_FAT32);
	if (!strcasecmp(type, alias)) {
		*dp_typ = DOSPTYP_WIN95_FAT32;
		return (0);
	}

	alias = g_part_alias_name(G_PART_ALIAS_LINUX_DATA);
	if (!strcasecmp(type, alias)) {
		*dp_typ = DOSPTYP_LINUX;
		return (0);
	}

	alias = g_part_alias_name(G_PART_ALIAS_LINUX_SWAP);
	if (!strcasecmp(type, alias)) {
		*dp_typ = DOSPTYP_LINSWP;
		return (0);
	}

	alias = g_part_alias_name(G_PART_ALIAS_LINUX_LVM);
	if (!strcasecmp(type, alias)) {
		*dp_typ = DOSPTYP_LINLVM;
		return (0);
	}
	return (EINVAL);
}


	type = entry->ent.dp_typ;
	if (type == DOSPTYP_386BSD)
		return (g_part_alias_name(G_PART_ALIAS_FREEBSD));

	if (type == DOSPTYP_WIN95_FAT32)
		return (g_part_alias_name(G_PART_ALIAS_WIN95_FAT32));

	if (type == DOSPTYP_LINUX)
		return (g_part_alias_name(G_PART_ALIAS_LINUX_DATA));
	
	if (type == DOSPTYP_LINSWP)
		return (g_part_alias_name(G_PART_ALIAS_LINUX_SWAP));

	if (type == DOSPTYP_LINLVM)
		return (g_part_alias_name(G_PART_ALIAS_LINUX_LVM));

	snprintf(buf, bufsz, "!%d", type);
	return (buf);
}

Lines 44-49 Link Here

(-)sys/sys/diskmbr.h (+2 lines)
44	#define DOSMAGIC 0xAA55	44	#define DOSMAGIC 0xAA55
45		45
46	#define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */	46	#define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */
		47	#define DOSPTYP_WIN95_FAT32 0x0b /* Win95 FAT32 */
		48	#define DOSPTYP_LINLVM 0x8e /* Linux LVM partition */
47	#define DOSPTYP_LINSWP 0x82 /* Linux swap partition */	49	#define DOSPTYP_LINSWP 0x82 /* Linux swap partition */
48	#define DOSPTYP_LINUX 0x83 /* Linux partition */	50	#define DOSPTYP_LINUX 0x83 /* Linux partition */
49	#define DOSPTYP_PMBR 0xee /* GPT Protective MBR */	51	#define DOSPTYP_PMBR 0xee /* GPT Protective MBR */

Return to bug 147664

Lines 124-129 Link Here

(-)sys/geom/part/g_part_mbr.c (+37 lines)
124	*dp_typ = DOSPTYP_386BSD;	124	*dp_typ = DOSPTYP_386BSD;
125	return (0);	125	return (0);
126	}	126	}
		127
		128	alias = g_part_alias_name(G_PART_ALIAS_WIN95_FAT32);
		129	if (!strcasecmp(type, alias)) {
		130	*dp_typ = DOSPTYP_WIN95_FAT32;
		131	return (0);
		132	}
		133
		134	alias = g_part_alias_name(G_PART_ALIAS_LINUX_DATA);
		135	if (!strcasecmp(type, alias)) {
		136	*dp_typ = DOSPTYP_LINUX;
		137	return (0);
		138	}
		139
		140	alias = g_part_alias_name(G_PART_ALIAS_LINUX_SWAP);
		141	if (!strcasecmp(type, alias)) {
		142	*dp_typ = DOSPTYP_LINSWP;
		143	return (0);
		144	}
		145
		146	alias = g_part_alias_name(G_PART_ALIAS_LINUX_LVM);
		147	if (!strcasecmp(type, alias)) {
		148	*dp_typ = DOSPTYP_LINLVM;
		149	return (0);
		150	}
127	return (EINVAL);	151	return (EINVAL);
128	}	152	}
129		153
Lines 483-488 Link Here
483	type = entry->ent.dp_typ;	507	type = entry->ent.dp_typ;
484	if (type == DOSPTYP_386BSD)	508	if (type == DOSPTYP_386BSD)
485	return (g_part_alias_name(G_PART_ALIAS_FREEBSD));	509	return (g_part_alias_name(G_PART_ALIAS_FREEBSD));
		510
		511	if (type == DOSPTYP_WIN95_FAT32)
		512	return (g_part_alias_name(G_PART_ALIAS_WIN95_FAT32));
		513
		514	if (type == DOSPTYP_LINUX)
		515	return (g_part_alias_name(G_PART_ALIAS_LINUX_DATA));
		516
		517	if (type == DOSPTYP_LINSWP)
		518	return (g_part_alias_name(G_PART_ALIAS_LINUX_SWAP));
		519
		520	if (type == DOSPTYP_LINLVM)
		521	return (g_part_alias_name(G_PART_ALIAS_LINUX_LVM));
		522
486	snprintf(buf, bufsz, "!%d", type);	523	snprintf(buf, bufsz, "!%d", type);
487	return (buf);	524	return (buf);
488	}	525	}