svn commit: r213371 - in stable/8/sys: geom/part sys
Andrey V. Elsukov
ae at FreeBSD.org
Sat Oct 2 22:12:05 UTC 2010
Author: ae
Date: Sat Oct 2 22:12:04 2010
New Revision: 213371
URL: http://svn.freebsd.org/changeset/base/213371
Log:
MFC r209536 (by rpaulo):
Add NTFS partition type to GEOM_MBR.
Approved by: kib (mentor)
Modified:
stable/8/sys/geom/part/g_part.c
stable/8/sys/geom/part/g_part.h
stable/8/sys/geom/part/g_part_mbr.c
stable/8/sys/sys/diskmbr.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/geom/part/g_part.c
==============================================================================
--- stable/8/sys/geom/part/g_part.c Sat Oct 2 22:08:17 2010 (r213370)
+++ stable/8/sys/geom/part/g_part.c Sat Oct 2 22:12:04 2010 (r213371)
@@ -91,6 +91,7 @@ struct g_part_alias_list {
{ "ms-ldm-data", G_PART_ALIAS_MS_LDM_DATA },
{ "ms-ldm-metadata", G_PART_ALIAS_MS_LDM_METADATA },
{ "ms-reserved", G_PART_ALIAS_MS_RESERVED },
+ { "ntfs", G_PART_ALIAS_MS_NTFS },
{ "netbsd-ccd", G_PART_ALIAS_NETBSD_CCD },
{ "netbsd-cgd", G_PART_ALIAS_NETBSD_CGD },
{ "netbsd-ffs", G_PART_ALIAS_NETBSD_FFS },
Modified: stable/8/sys/geom/part/g_part.h
==============================================================================
--- stable/8/sys/geom/part/g_part.h Sat Oct 2 22:08:17 2010 (r213370)
+++ stable/8/sys/geom/part/g_part.h Sat Oct 2 22:12:04 2010 (r213371)
@@ -59,6 +59,7 @@ enum g_part_alias {
G_PART_ALIAS_MS_LDM_DATA, /* A Microsoft LDM Data part. entry. */
G_PART_ALIAS_MS_LDM_METADATA, /* A Microsoft LDM Metadata entry. */
G_PART_ALIAS_MS_RESERVED, /* A Microsoft Reserved part. entry. */
+ G_PART_ALIAS_MS_NTFS, /* A Microsoft NTFS partition entry */
G_PART_ALIAS_NETBSD_CCD, /* A NetBSD CCD partition entry. */
G_PART_ALIAS_NETBSD_CGD, /* A NetBSD CGD partition entry. */
G_PART_ALIAS_NETBSD_FFS, /* A NetBSD FFS partition entry. */
Modified: stable/8/sys/geom/part/g_part_mbr.c
==============================================================================
--- stable/8/sys/geom/part/g_part_mbr.c Sat Oct 2 22:08:17 2010 (r213370)
+++ stable/8/sys/geom/part/g_part_mbr.c Sat Oct 2 22:12:04 2010 (r213371)
@@ -127,6 +127,11 @@ mbr_parse_type(const char *type, u_char
*dp_typ = DOSPTYP_386BSD;
return (0);
}
+ alias = g_part_alias_name(G_PART_ALIAS_MS_NTFS);
+ if (!strcasecmp(type, alias)) {
+ *dp_typ = DOSPTYP_NTFS;
+ return (0);
+ }
return (EINVAL);
}
@@ -509,9 +514,14 @@ g_part_mbr_type(struct g_part_table *bas
entry = (struct g_part_mbr_entry *)baseentry;
type = entry->ent.dp_typ;
- if (type == DOSPTYP_386BSD)
+ switch (type) {
+ case DOSPTYP_386BSD:
return (g_part_alias_name(G_PART_ALIAS_FREEBSD));
- snprintf(buf, bufsz, "!%d", type);
+ case DOSPTYP_NTFS:
+ return (g_part_alias_name(G_PART_ALIAS_MS_NTFS));
+ default:
+ snprintf(buf, bufsz, "!%d", type);
+ }
return (buf);
}
Modified: stable/8/sys/sys/diskmbr.h
==============================================================================
--- stable/8/sys/sys/diskmbr.h Sat Oct 2 22:08:17 2010 (r213370)
+++ stable/8/sys/sys/diskmbr.h Sat Oct 2 22:12:04 2010 (r213371)
@@ -49,6 +49,7 @@
#define DOSPTYP_PMBR 0xee /* GPT Protective MBR */
#define DOSPTYP_EXT 5 /* DOS extended partition */
#define DOSPTYP_EXTLBA 15 /* DOS extended partition */
+#define DOSPTYP_NTFS 0x07 /* NTFS partition */
struct dos_partition {
unsigned char dp_flag; /* bootstrap flags */
More information about the svn-src-all
mailing list