svn commit: r250287 - in stable/9/sys: geom/part sys

[Gavin Atkinson]

Author: gavin
Date: Sun May  5 19:24:51 2013
New Revision: 250287
URL: http://svnweb.freebsd.org/changeset/base/250287

Log:
  Merge r247961 from head:
    Support the FAT16 partition type in gpart(8)
  
  PR:		kern/174714
  Submitted by:	4721 at hushmail dot com

Modified:
  stable/9/sys/geom/part/g_part.c
  stable/9/sys/geom/part/g_part.h
  stable/9/sys/geom/part/g_part_mbr.c
  stable/9/sys/sys/diskmbr.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/sys/   (props changed)

Modified: stable/9/sys/geom/part/g_part.c
==============================================================================
--- stable/9/sys/geom/part/g_part.c	Sun May  5 19:09:34 2013	(r250286)
+++ stable/9/sys/geom/part/g_part.c	Sun May  5 19:24:51 2013	(r250287)
@@ -80,6 +80,7 @@ struct g_part_alias_list {
 	{ "bios-boot", G_PART_ALIAS_BIOS_BOOT },
 	{ "ebr", G_PART_ALIAS_EBR },
 	{ "efi", G_PART_ALIAS_EFI },
+	{ "fat16", G_PART_ALIAS_MS_FAT16 },
 	{ "fat32", G_PART_ALIAS_MS_FAT32 },
 	{ "freebsd", G_PART_ALIAS_FREEBSD },
 	{ "freebsd-boot", G_PART_ALIAS_FREEBSD_BOOT },

Modified: stable/9/sys/geom/part/g_part.h
==============================================================================
--- stable/9/sys/geom/part/g_part.h	Sun May  5 19:09:34 2013	(r250286)
+++ stable/9/sys/geom/part/g_part.h	Sun May  5 19:24:51 2013	(r250287)
@@ -68,6 +68,7 @@ enum g_part_alias {
 	G_PART_ALIAS_NETBSD_SWAP,	/* A NetBSD swap partition entry. */
 	G_PART_ALIAS_NETBSD_LFS,	/* A NetBSD LFS partition entry. */
 	G_PART_ALIAS_EBR,		/* A EBR partition entry. */
+	G_PART_ALIAS_MS_FAT16,		/* A Microsoft FAT16 partition entry. */
 	G_PART_ALIAS_MS_FAT32,		/* A Microsoft FAT32 partition entry. */
 	G_PART_ALIAS_BIOS_BOOT,		/* A GRUB 2 boot partition entry. */
 	G_PART_ALIAS_VMFS,		/* A VMware VMFS partition entry */

Modified: stable/9/sys/geom/part/g_part_mbr.c
==============================================================================
--- stable/9/sys/geom/part/g_part_mbr.c	Sun May  5 19:09:34 2013	(r250286)
+++ stable/9/sys/geom/part/g_part_mbr.c	Sun May  5 19:24:51 2013	(r250287)
@@ -118,6 +118,7 @@ static struct g_part_mbr_alias {
 	{ DOSPTYP_386BSD,	G_PART_ALIAS_FREEBSD },
 	{ DOSPTYP_EXT,		G_PART_ALIAS_EBR },
 	{ DOSPTYP_NTFS,		G_PART_ALIAS_MS_NTFS },
+	{ DOSPTYP_FAT16,	G_PART_ALIAS_MS_FAT16 },
 	{ DOSPTYP_FAT32,	G_PART_ALIAS_MS_FAT32 },
 	{ DOSPTYP_EXTLBA,	G_PART_ALIAS_EBR },
 	{ DOSPTYP_LDM,		G_PART_ALIAS_MS_LDM_DATA },

Modified: stable/9/sys/sys/diskmbr.h
==============================================================================
--- stable/9/sys/sys/diskmbr.h	Sun May  5 19:09:34 2013	(r250286)
+++ stable/9/sys/sys/diskmbr.h	Sun May  5 19:24:51 2013	(r250287)
@@ -45,6 +45,7 @@
 #define	DOSMAGIC	0xAA55
 
 #define	DOSPTYP_EXT	0x05	/* DOS extended partition */
+#define	DOSPTYP_FAT16	0x06	/* FAT16 partition */
 #define	DOSPTYP_NTFS	0x07	/* NTFS partition */
 #define	DOSPTYP_FAT32	0x0b	/* FAT32 partition */
 #define	DOSPTYP_EXTLBA	0x0f	/* DOS extended partition */