Author: emaste
Date: Sun Jun 17 20:06:27 2018
New Revision: 335300
URL: https://svnweb.freebsd.org/changeset/base/335300
Log:
Sort geom/part mbr/ebr/ldm alias table entries
Having the table entries in alpha order simplifies future additions.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/geom/part/g_part_ebr.c
head/sys/geom/part/g_part_ldm.c
head/sys/geom/part/g_part_mbr.c
Modified: head/sys/geom/part/g_part_ebr.c
==============================================================================
--- head/sys/geom/part/g_part_ebr.c Sun Jun 17 19:44:24 2018
(r335299)
+++ head/sys/geom/part/g_part_ebr.c Sun Jun 17 20:06:27 2018
(r335300)
@@ -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 *,
Modified: head/sys/geom/part/g_part_ldm.c
==============================================================================
--- head/sys/geom/part/g_part_ldm.c Sun Jun 17 19:44:24 2018
(r335299)
+++ head/sys/geom/part/g_part_ldm.c Sun Jun 17 20:06:27 2018
(r335300)
@@ -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*
Modified: head/sys/geom/part/g_part_mbr.c
==============================================================================
--- head/sys/geom/part/g_part_mbr.c Sun Jun 17 19:44:24 2018
(r335299)
+++ head/sys/geom/part/g_part_mbr.c Sun Jun 17 20:06:27 2018
(r335300)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
