Author: emaste
Date: Wed Dec 16 16:44:56 2015
New Revision: 292341
URL: https://svnweb.freebsd.org/changeset/base/292341
Log:
MFC r289349: mkimg: support fat16b partitions (MBR type 06h)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/usr.bin/mkimg/ebr.c
stable/10/usr.bin/mkimg/mbr.c
stable/10/usr.bin/mkimg/scheme.c
stable/10/usr.bin/mkimg/scheme.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/mkimg/ebr.c
==============================================================================
--- stable/10/usr.bin/mkimg/ebr.c Wed Dec 16 16:42:24 2015
(r292340)
+++ stable/10/usr.bin/mkimg/ebr.c Wed Dec 16 16:44:56 2015
(r292341)
@@ -39,11 +39,15 @@ __FBSDID("$FreeBSD$");
#include "mkimg.h"
#include "scheme.h"
+#ifndef DOSPTYP_FAT16B
+#define DOSPTYP_FAT16B 0x06
+#endif
#ifndef DOSPTYP_FAT32
#define DOSPTYP_FAT32 0x0b
#endif
static struct mkimg_alias ebr_aliases[] = {
+ { ALIAS_FAT16B, ALIAS_INT2TYPE(DOSPTYP_FAT16B) },
{ ALIAS_FAT32, ALIAS_INT2TYPE(DOSPTYP_FAT32) },
{ ALIAS_FREEBSD, ALIAS_INT2TYPE(DOSPTYP_386BSD) },
{ ALIAS_NONE, 0 }
Modified: stable/10/usr.bin/mkimg/mbr.c
==============================================================================
--- stable/10/usr.bin/mkimg/mbr.c Wed Dec 16 16:42:24 2015
(r292340)
+++ stable/10/usr.bin/mkimg/mbr.c Wed Dec 16 16:44:56 2015
(r292341)
@@ -39,6 +39,9 @@ __FBSDID("$FreeBSD$");
#include "mkimg.h"
#include "scheme.h"
+#ifndef DOSPTYP_FAT16B
+#define DOSPTYP_FAT16B 0x06
+#endif
#ifndef DOSPTYP_FAT32
#define DOSPTYP_FAT32 0x0b
#endif
@@ -49,6 +52,7 @@ __FBSDID("$FreeBSD$");
static struct mkimg_alias mbr_aliases[] = {
{ ALIAS_EBR, ALIAS_INT2TYPE(DOSPTYP_EXT) },
{ ALIAS_EFI, ALIAS_INT2TYPE(DOSPTYP_EFI) },
+ { ALIAS_FAT16B, ALIAS_INT2TYPE(DOSPTYP_FAT16B) },
{ ALIAS_FAT32, ALIAS_INT2TYPE(DOSPTYP_FAT32) },
{ ALIAS_FREEBSD, ALIAS_INT2TYPE(DOSPTYP_386BSD) },
{ ALIAS_NTFS, ALIAS_INT2TYPE(DOSPTYP_NTFS) },
Modified: stable/10/usr.bin/mkimg/scheme.c
==============================================================================
--- stable/10/usr.bin/mkimg/scheme.c Wed Dec 16 16:42:24 2015
(r292340)
+++ stable/10/usr.bin/mkimg/scheme.c Wed Dec 16 16:44:56 2015
(r292341)
@@ -50,6 +50,7 @@ static struct {
} scheme_alias[] = {
{ "ebr", ALIAS_EBR },
{ "efi", ALIAS_EFI },
+ { "fat16b", ALIAS_FAT16B },
{ "fat32", ALIAS_FAT32 },
{ "freebsd", ALIAS_FREEBSD },
{ "freebsd-boot", ALIAS_FREEBSD_BOOT },
Modified: stable/10/usr.bin/mkimg/scheme.h
==============================================================================
--- stable/10/usr.bin/mkimg/scheme.h Wed Dec 16 16:42:24 2015
(r292340)
+++ stable/10/usr.bin/mkimg/scheme.h Wed Dec 16 16:44:56 2015
(r292341)
@@ -36,6 +36,7 @@ enum alias {
/* start */
ALIAS_EBR,
ALIAS_EFI,
+ ALIAS_FAT16B,
ALIAS_FAT32,
ALIAS_FREEBSD,
ALIAS_FREEBSD_BOOT,
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
