From a0a8412b2a2f02f1c4bc16ad2c24d6bedf2541bb Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 17 Jun 2018 20:06:27 +0000
Subject: [PATCH] Sort geom/part mbr/ebr/ldm alias table entries
Having the table entries in alpha order simplifies future additions.
Sponsored by: The FreeBSD Foundation
---
sys/geom/part/g_part_ebr.c | 6 +++---
sys/geom/part/g_part_ldm.c | 8 ++++----
sys/geom/part/g_part_mbr.c | 14 +++++++-------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c
index 788990c710d7..dc8f7fc3cf92 100644
--- a/sys/geom/part/g_part_ebr.c
+++ b/sys/geom/part/g_part_ebr.c
@@ -135,13 +135,13 @@ static struct g_part_ebr_alias {
int alias;
} ebr_alias_match[] = {
{ DOSPTYP_386BSD, G_PART_ALIAS_FREEBSD },
- { DOSPTYP_NTFS, G_PART_ALIAS_MS_NTFS },
{ DOSPTYP_FAT32, G_PART_ALIAS_MS_FAT32 },
{ DOSPTYP_FAT32LBA, G_PART_ALIAS_MS_FAT32LBA },
- { DOSPTYP_LINSWP, G_PART_ALIAS_LINUX_SWAP },
- { DOSPTYP_LINUX, G_PART_ALIAS_LINUX_DATA },
{ DOSPTYP_LINLVM, G_PART_ALIAS_LINUX_LVM },
{ DOSPTYP_LINRAID, G_PART_ALIAS_LINUX_RAID },
+ { DOSPTYP_LINSWP, G_PART_ALIAS_LINUX_SWAP },
+ { DOSPTYP_LINUX, G_PART_ALIAS_LINUX_DATA },
+ { DOSPTYP_NTFS, G_PART_ALIAS_MS_NTFS },
};
static void ebr_set_chs(struct g_part_table *, uint32_t, u_char *, u_char *,
diff --git a/sys/geom/part/g_part_ldm.c b/sys/geom/part/g_part_ldm.c
index abfaeca96ad2..d98b21ffd8ee 100644
--- a/sys/geom/part/g_part_ldm.c
+++ b/sys/geom/part/g_part_ldm.c
@@ -369,15 +369,15 @@ static struct g_part_ldm_alias {
u_char typ;
int alias;
} ldm_alias_match[] = {
- { DOSPTYP_NTFS, G_PART_ALIAS_MS_NTFS },
+ { DOSPTYP_386BSD, G_PART_ALIAS_FREEBSD },
{ DOSPTYP_FAT32, G_PART_ALIAS_MS_FAT32 },
{ DOSPTYP_FAT32LBA, G_PART_ALIAS_MS_FAT32LBA },
- { DOSPTYP_386BSD, G_PART_ALIAS_FREEBSD },
{ DOSPTYP_LDM, G_PART_ALIAS_MS_LDM_DATA },
- { DOSPTYP_LINSWP, G_PART_ALIAS_LINUX_SWAP },
- { DOSPTYP_LINUX, G_PART_ALIAS_LINUX_DATA },
{ DOSPTYP_LINLVM, G_PART_ALIAS_LINUX_LVM },
{ DOSPTYP_LINRAID, G_PART_ALIAS_LINUX_RAID },
+ { DOSPTYP_LINSWP, G_PART_ALIAS_LINUX_SWAP },
+ { DOSPTYP_LINUX, G_PART_ALIAS_LINUX_DATA },
+ { DOSPTYP_NTFS, G_PART_ALIAS_MS_NTFS },
};
static u_char*
diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c
index 9865156ced67..f3a2d0340634 100644
--- a/sys/geom/part/g_part_mbr.c
+++ b/sys/geom/part/g_part_mbr.c
@@ -128,23 +128,23 @@ static struct g_part_mbr_alias {
int alias;
} mbr_alias_match[] = {
{ DOSPTYP_386BSD, G_PART_ALIAS_FREEBSD },
+ { DOSPTYP_APPLE_BOOT, G_PART_ALIAS_APPLE_BOOT },
+ { DOSPTYP_APPLE_UFS, G_PART_ALIAS_APPLE_UFS },
{ DOSPTYP_EXT, G_PART_ALIAS_EBR },
- { DOSPTYP_NTFS, G_PART_ALIAS_MS_NTFS },
+ { DOSPTYP_EXTLBA, G_PART_ALIAS_EBR },
{ DOSPTYP_FAT16, G_PART_ALIAS_MS_FAT16 },
{ DOSPTYP_FAT32, G_PART_ALIAS_MS_FAT32 },
{ DOSPTYP_FAT32LBA, G_PART_ALIAS_MS_FAT32LBA },
- { DOSPTYP_EXTLBA, G_PART_ALIAS_EBR },
+ { DOSPTYP_HFS, G_PART_ALIAS_APPLE_HFS },
{ DOSPTYP_LDM, G_PART_ALIAS_MS_LDM_DATA },
- { DOSPTYP_LINSWP, G_PART_ALIAS_LINUX_SWAP },
- { DOSPTYP_LINUX, G_PART_ALIAS_LINUX_DATA },
{ DOSPTYP_LINLVM, G_PART_ALIAS_LINUX_LVM },
{ DOSPTYP_LINRAID, G_PART_ALIAS_LINUX_RAID },
+ { DOSPTYP_LINSWP, G_PART_ALIAS_LINUX_SWAP },
+ { DOSPTYP_LINUX, G_PART_ALIAS_LINUX_DATA },
+ { DOSPTYP_NTFS, G_PART_ALIAS_MS_NTFS },
{ DOSPTYP_PPCBOOT, G_PART_ALIAS_PREP_BOOT },
{ DOSPTYP_VMFS, G_PART_ALIAS_VMFS },
{ DOSPTYP_VMKDIAG, G_PART_ALIAS_VMKDIAG },
- { DOSPTYP_APPLE_UFS, G_PART_ALIAS_APPLE_UFS },
- { DOSPTYP_APPLE_BOOT, G_PART_ALIAS_APPLE_BOOT },
- { DOSPTYP_HFS, G_PART_ALIAS_APPLE_HFS },
};
static int