Author: ae
Date: Fri Jun 25 08:53:51 2010
New Revision: 209522
URL: http://svn.freebsd.org/changeset/base/209522
Log:
MFC r200539 (by rpaulo):
Add Microsoft and NetBSD partition types handling.
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_gpt.c
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 Fri Jun 25 05:36:36 2010
(r209521)
+++ stable/8/sys/geom/part/g_part.c Fri Jun 25 08:53:51 2010
(r209522)
@@ -87,6 +87,16 @@ struct g_part_alias_list {
{ "linux-lvm", G_PART_ALIAS_LINUX_LVM },
{ "linux-raid", G_PART_ALIAS_LINUX_RAID },
{ "linux-swap", G_PART_ALIAS_LINUX_SWAP },
+ { "ms-basic-data", G_PART_ALIAS_MS_BASIC_DATA },
+ { "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 },
+ { "netbsd-ccd", G_PART_ALIAS_NETBSD_CCD },
+ { "netbsd-cgd", G_PART_ALIAS_NETBSD_CGD },
+ { "netbsd-ffs", G_PART_ALIAS_NETBSD_FFS },
+ { "netbsd-lfs", G_PART_ALIAS_NETBSD_LFS },
+ { "netbsd-raid", G_PART_ALIAS_NETBSD_RAID },
+ { "netbsd-swap", G_PART_ALIAS_NETBSD_SWAP },
{ "mbr", G_PART_ALIAS_MBR }
};
Modified: stable/8/sys/geom/part/g_part.h
==============================================================================
--- stable/8/sys/geom/part/g_part.h Fri Jun 25 05:36:36 2010
(r209521)
+++ stable/8/sys/geom/part/g_part.h Fri Jun 25 08:53:51 2010
(r209522)
@@ -55,6 +55,16 @@ enum g_part_alias {
G_PART_ALIAS_LINUX_LVM, /* A Linux LVM partition entry. */
G_PART_ALIAS_LINUX_RAID, /* A Linux RAID partition entry. */
G_PART_ALIAS_LINUX_SWAP, /* A Linux swap partition entry. */
+ G_PART_ALIAS_MS_BASIC_DATA, /* A Microsoft Data part. entry. */
+ 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_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. */
+ G_PART_ALIAS_NETBSD_RAID, /* A NetBSD RAID partition entry. */
+ G_PART_ALIAS_NETBSD_SWAP, /* A NetBSD swap partition entry. */
+ G_PART_ALIAS_NETBSD_LFS, /* A NetBSD LFS partition entry. */
/* Keep the following last */
G_PART_ALIAS_COUNT
};
Modified: stable/8/sys/geom/part/g_part_gpt.c
==============================================================================
--- stable/8/sys/geom/part/g_part_gpt.c Fri Jun 25 05:36:36 2010
(r209521)
+++ stable/8/sys/geom/part/g_part_gpt.c Fri Jun 25 08:53:51 2010
(r209522)
@@ -152,6 +152,16 @@ static struct uuid gpt_uuid_linux_data =
static struct uuid gpt_uuid_linux_lvm = GPT_ENT_TYPE_LINUX_LVM;
static struct uuid gpt_uuid_linux_raid = GPT_ENT_TYPE_LINUX_RAID;
static struct uuid gpt_uuid_linux_swap = GPT_ENT_TYPE_LINUX_SWAP;
+static struct uuid gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA;
+static struct uuid gpt_uuid_ms_reserved = GPT_ENT_TYPE_MS_RESERVED;
+static struct uuid gpt_uuid_ms_ldm_data = GPT_ENT_TYPE_MS_LDM_DATA;
+static struct uuid gpt_uuid_ms_ldm_metadata = GPT_ENT_TYPE_MS_LDM_METADATA;
+static struct uuid gpt_uuid_netbsd_ccd = GPT_ENT_TYPE_NETBSD_CCD;
+static struct uuid gpt_uuid_netbsd_cgd = GPT_ENT_TYPE_NETBSD_CGD;
+static struct uuid gpt_uuid_netbsd_ffs = GPT_ENT_TYPE_NETBSD_FFS;
+static struct uuid gpt_uuid_netbsd_lfs = GPT_ENT_TYPE_NETBSD_LFS;
+static struct uuid gpt_uuid_netbsd_raid = GPT_ENT_TYPE_NETBSD_RAID;
+static struct uuid gpt_uuid_netbsd_swap = GPT_ENT_TYPE_NETBSD_SWAP;
static struct uuid gpt_uuid_mbr = GPT_ENT_TYPE_MBR;
static struct uuid gpt_uuid_unused = GPT_ENT_TYPE_UNUSED;
@@ -178,6 +188,17 @@ static struct g_part_uuid_alias {
{ &gpt_uuid_linux_raid, G_PART_ALIAS_LINUX_RAID },
{ &gpt_uuid_linux_swap, G_PART_ALIAS_LINUX_SWAP },
{ &gpt_uuid_mbr, G_PART_ALIAS_MBR },
+ { &gpt_uuid_ms_basic_data, G_PART_ALIAS_MS_BASIC_DATA },
+ { &gpt_uuid_ms_ldm_data, G_PART_ALIAS_MS_LDM_DATA },
+ { &gpt_uuid_ms_ldm_metadata, G_PART_ALIAS_MS_LDM_METADATA },
+ { &gpt_uuid_ms_reserved, G_PART_ALIAS_MS_RESERVED },
+ { &gpt_uuid_netbsd_ccd, G_PART_ALIAS_NETBSD_CCD },
+ { &gpt_uuid_netbsd_cgd, G_PART_ALIAS_NETBSD_CGD },
+ { &gpt_uuid_netbsd_ffs, G_PART_ALIAS_NETBSD_FFS },
+ { &gpt_uuid_netbsd_lfs, G_PART_ALIAS_NETBSD_LFS },
+ { &gpt_uuid_netbsd_raid, G_PART_ALIAS_NETBSD_RAID },
+ { &gpt_uuid_netbsd_swap, G_PART_ALIAS_NETBSD_SWAP },
+
{ NULL, 0 }
};
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
