Author: ae
Date: Thu Mar 19 14:09:27 2015
New Revision: 280261
URL: https://svnweb.freebsd.org/changeset/base/280261
Log:
MFC r269854:
Remove duplicate entry.
MFC r279935:
Add GUID and alias for Apple Core Storage partition.
PR: 196241
Modified:
stable/10/sbin/geom/class/part/gpart.8
stable/10/sys/geom/part/g_part.c
stable/10/sys/geom/part/g_part.h
stable/10/sys/geom/part/g_part_gpt.c
stable/10/sys/sys/gpt.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sbin/geom/class/part/gpart.8
==============================================================================
--- stable/10/sbin/geom/class/part/gpart.8 Thu Mar 19 13:57:47 2015
(r280260)
+++ stable/10/sbin/geom/class/part/gpart.8 Thu Mar 19 14:09:27 2015
(r280261)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 12, 2014
+.Dd March 12, 2015
.Dt GPART 8
.Os
.Sh NAME
@@ -659,12 +659,11 @@ Another symbolic names that can be used
.Cm gpart
utility are:
.Bl -tag -width ".Cm dragonfly-disklabel64"
-.It Cm apple-boot
-An Apple Mac OS X partition dedicated to bootloader.
-The scheme-specific types are
-.Qq Li "!Apple_Bootstrap"
-for APM and
-.Qq Li "!426f6f74-0000-11aa-aa11-00306543ecac"
+.It Cm apple-core-storage
+An Apple Mac OS X partition used by logical volume manager known as
+Core Storage.
+The scheme-specific type is
+.Qq Li "!53746f72-6167-11aa-aa11-00306543ecac"
for GPT.
.It Cm apple-hfs
An Apple Mac OS X partition that contains a HFS or HFS+ filesystem.
Modified: stable/10/sys/geom/part/g_part.c
==============================================================================
--- stable/10/sys/geom/part/g_part.c Thu Mar 19 13:57:47 2015
(r280260)
+++ stable/10/sys/geom/part/g_part.c Thu Mar 19 14:09:27 2015
(r280261)
@@ -70,6 +70,7 @@ struct g_part_alias_list {
enum g_part_alias alias;
} g_part_alias_list[G_PART_ALIAS_COUNT] = {
{ "apple-boot", G_PART_ALIAS_APPLE_BOOT },
+ { "apple-core-storage", G_PART_ALIAS_APPLE_CORE_STORAGE },
{ "apple-hfs", G_PART_ALIAS_APPLE_HFS },
{ "apple-label", G_PART_ALIAS_APPLE_LABEL },
{ "apple-raid", G_PART_ALIAS_APPLE_RAID },
Modified: stable/10/sys/geom/part/g_part.h
==============================================================================
--- stable/10/sys/geom/part/g_part.h Thu Mar 19 13:57:47 2015
(r280260)
+++ stable/10/sys/geom/part/g_part.h Thu Mar 19 14:09:27 2015
(r280261)
@@ -85,6 +85,7 @@ enum g_part_alias {
G_PART_ALIAS_DFBSD_HAMMER, /* A DfBSD HAMMER FS partition entry */
G_PART_ALIAS_DFBSD_HAMMER2, /* A DfBSD HAMMER2 FS partition entry */
G_PART_ALIAS_PREP_BOOT, /* A PREP/CHRP boot partition entry. */
+ G_PART_ALIAS_APPLE_CORE_STORAGE,/* An Apple Core Storage partition. */
/* Keep the following last */
G_PART_ALIAS_COUNT
};
Modified: stable/10/sys/geom/part/g_part_gpt.c
==============================================================================
--- stable/10/sys/geom/part/g_part_gpt.c Thu Mar 19 13:57:47 2015
(r280260)
+++ stable/10/sys/geom/part/g_part_gpt.c Thu Mar 19 14:09:27 2015
(r280261)
@@ -146,6 +146,8 @@ static struct g_part_scheme g_part_gpt_s
G_PART_SCHEME_DECLARE(g_part_gpt);
static struct uuid gpt_uuid_apple_boot = GPT_ENT_TYPE_APPLE_BOOT;
+static struct uuid gpt_uuid_apple_core_storage =
+ GPT_ENT_TYPE_APPLE_CORE_STORAGE;
static struct uuid gpt_uuid_apple_hfs = GPT_ENT_TYPE_APPLE_HFS;
static struct uuid gpt_uuid_apple_label = GPT_ENT_TYPE_APPLE_LABEL;
static struct uuid gpt_uuid_apple_raid = GPT_ENT_TYPE_APPLE_RAID;
@@ -198,6 +200,7 @@ static struct g_part_uuid_alias {
int mbrtype;
} gpt_uuid_alias_match[] = {
{ &gpt_uuid_apple_boot, G_PART_ALIAS_APPLE_BOOT, 0xab },
+ { &gpt_uuid_apple_core_storage, G_PART_ALIAS_APPLE_CORE_STORAGE, 0 },
{ &gpt_uuid_apple_hfs, G_PART_ALIAS_APPLE_HFS, 0xaf },
{ &gpt_uuid_apple_label, G_PART_ALIAS_APPLE_LABEL, 0 },
{ &gpt_uuid_apple_raid, G_PART_ALIAS_APPLE_RAID, 0 },
Modified: stable/10/sys/sys/gpt.h
==============================================================================
--- stable/10/sys/sys/gpt.h Thu Mar 19 13:57:47 2015 (r280260)
+++ stable/10/sys/sys/gpt.h Thu Mar 19 14:09:27 2015 (r280261)
@@ -150,6 +150,8 @@ struct gpt_ent {
{0x4C616265,0x6c00,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
#define GPT_ENT_TYPE_APPLE_TV_RECOVERY \
{0x5265636f,0x7665,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
+#define GPT_ENT_TYPE_APPLE_CORE_STORAGE \
+ {0x53746f72,0x6167,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
#define GPT_ENT_TYPE_NETBSD_FFS \
{0x49f48d5a,0xb10e,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
