diff options
| author | ae <ae@FreeBSD.org> | 2015-03-19 14:09:27 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2015-03-19 14:09:27 +0000 |
| commit | c07681e98fa5c95043dac5a322c9d6ad25abca8c (patch) | |
| tree | 37310b9f97df43ce6e49f80138be7557181c90e1 /sys/geom | |
| parent | 6102a34d3875e6b3f22e0245d7698fe549c674a1 (diff) | |
| download | FreeBSD-src-c07681e98fa5c95043dac5a322c9d6ad25abca8c.zip FreeBSD-src-c07681e98fa5c95043dac5a322c9d6ad25abca8c.tar.gz | |
MFC r269854:
Remove duplicate entry.
MFC r279935:
Add GUID and alias for Apple Core Storage partition.
PR: 196241
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/part/g_part.c | 1 | ||||
| -rw-r--r-- | sys/geom/part/g_part.h | 1 | ||||
| -rw-r--r-- | sys/geom/part/g_part_gpt.c | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 096a6f5..b3e9f27 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -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 }, diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h index d2c2d23..39b7f95 100644 --- a/sys/geom/part/g_part.h +++ b/sys/geom/part/g_part.h @@ -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 }; diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 1b375e3..cf64816 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -146,6 +146,8 @@ static struct g_part_scheme g_part_gpt_scheme = { 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 }, |
