[Midnightbsd-cvs] src [11976] trunk/usr.bin/mkimg: attempt to fix some of the partition types
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 29 12:24:08 EDT 2018
Revision: 11976
http://svnweb.midnightbsd.org/src/?rev=11976
Author: laffer1
Date: 2018-07-29 12:24:06 -0400 (Sun, 29 Jul 2018)
Log Message:
-----------
attempt to fix some of the partition types
Modified Paths:
--------------
trunk/usr.bin/mkimg/apm.c
trunk/usr.bin/mkimg/bsd.c
trunk/usr.bin/mkimg/ebr.c
trunk/usr.bin/mkimg/gpt.c
trunk/usr.bin/mkimg/mbr.c
trunk/usr.bin/mkimg/pc98.c
trunk/usr.bin/mkimg/scheme.c
trunk/usr.bin/mkimg/scheme.h
trunk/usr.bin/mkimg/vtoc8.c
Modified: trunk/usr.bin/mkimg/apm.c
===================================================================
--- trunk/usr.bin/mkimg/apm.c 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/apm.c 2018-07-29 16:24:06 UTC (rev 11976)
@@ -48,13 +48,13 @@
#endif
static struct mkimg_alias apm_aliases[] = {
- { ALIAS_FREEBSD, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD) },
- { ALIAS_FREEBSD_BOOT, ALIAS_PTR2TYPE(APM_ENT_TYPE_APPLE_BOOT) },
- { ALIAS_FREEBSD_NANDFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_NANDFS) },
- { ALIAS_FREEBSD_SWAP, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_SWAP) },
- { ALIAS_FREEBSD_UFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_UFS) },
- { ALIAS_FREEBSD_VINUM, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_VINUM) },
- { ALIAS_FREEBSD_ZFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_ZFS) },
+ { ALIAS_MIDNIGHTBSD, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD) },
+ { ALIAS_MIDNIGHTBSD_BOOT, ALIAS_PTR2TYPE(APM_ENT_TYPE_APPLE_BOOT) },
+ { ALIAS_MIDNIGHTBSD_NANDFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_NANDFS) },
+ { ALIAS_MIDNIGHTBSD_SWAP, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_SWAP) },
+ { ALIAS_MIDNIGHTBSD_UFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_UFS) },
+ { ALIAS_MIDNIGHTBSD_VINUM, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_VINUM) },
+ { ALIAS_MIDNIGHTBSD_ZFS, ALIAS_PTR2TYPE(APM_ENT_TYPE_FREEBSD_ZFS) },
{ ALIAS_NONE, 0 }
};
Modified: trunk/usr.bin/mkimg/bsd.c
===================================================================
--- trunk/usr.bin/mkimg/bsd.c 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/bsd.c 2018-07-29 16:24:06 UTC (rev 11976)
@@ -45,11 +45,11 @@
#endif
static struct mkimg_alias bsd_aliases[] = {
- { ALIAS_FREEBSD_NANDFS, ALIAS_INT2TYPE(FS_NANDFS) },
- { ALIAS_FREEBSD_SWAP, ALIAS_INT2TYPE(FS_SWAP) },
- { ALIAS_FREEBSD_UFS, ALIAS_INT2TYPE(FS_BSDFFS) },
- { ALIAS_FREEBSD_VINUM, ALIAS_INT2TYPE(FS_VINUM) },
- { ALIAS_FREEBSD_ZFS, ALIAS_INT2TYPE(FS_ZFS) },
+ { ALIAS_MIDNIGHTBSD_NANDFS, ALIAS_INT2TYPE(FS_NANDFS) },
+ { ALIAS_MIDNIGHTBSD_SWAP, ALIAS_INT2TYPE(FS_SWAP) },
+ { ALIAS_MIDNIGHTBSD_UFS, ALIAS_INT2TYPE(FS_BSDFFS) },
+ { ALIAS_MIDNIGHTBSD_VINUM, ALIAS_INT2TYPE(FS_VINUM) },
+ { ALIAS_MIDNIGHTBSD_ZFS, ALIAS_INT2TYPE(FS_ZFS) },
{ ALIAS_NONE, 0 }
};
Modified: trunk/usr.bin/mkimg/ebr.c
===================================================================
--- trunk/usr.bin/mkimg/ebr.c 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/ebr.c 2018-07-29 16:24:06 UTC (rev 11976)
@@ -50,7 +50,7 @@
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_MIDNIGHTBSD, ALIAS_INT2TYPE(DOSPTYP_386BSD) },
{ ALIAS_NONE, 0 }
};
Modified: trunk/usr.bin/mkimg/gpt.c
===================================================================
--- trunk/usr.bin/mkimg/gpt.c 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/gpt.c 2018-07-29 16:24:06 UTC (rev 11976)
@@ -50,25 +50,25 @@
#endif
static uuid_t gpt_uuid_efi = GPT_ENT_TYPE_EFI;
-static uuid_t gpt_uuid_freebsd = GPT_ENT_TYPE_FREEBSD;
-static uuid_t gpt_uuid_freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT;
-static uuid_t gpt_uuid_freebsd_nandfs = GPT_ENT_TYPE_FREEBSD_NANDFS;
-static uuid_t gpt_uuid_freebsd_swap = GPT_ENT_TYPE_FREEBSD_SWAP;
-static uuid_t gpt_uuid_freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS;
-static uuid_t gpt_uuid_freebsd_vinum = GPT_ENT_TYPE_FREEBSD_VINUM;
-static uuid_t gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS;
+static uuid_t gpt_uuid_mnbsd = GPT_ENT_TYPE_FREEBSD;
+static uuid_t gpt_uuid_mnbsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT;
+static uuid_t gpt_uuid_mnbsd_nandfs = GPT_ENT_TYPE_FREEBSD_NANDFS;
+static uuid_t gpt_uuid_mnbsd_swap = GPT_ENT_TYPE_FREEBSD_SWAP;
+static uuid_t gpt_uuid_mnbsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS;
+static uuid_t gpt_uuid_mnbsd_vinum = GPT_ENT_TYPE_FREEBSD_VINUM;
+static uuid_t gpt_uuid_mnbsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS;
static uuid_t gpt_uuid_mbr = GPT_ENT_TYPE_MBR;
static uuid_t gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA;
static struct mkimg_alias gpt_aliases[] = {
{ ALIAS_EFI, ALIAS_PTR2TYPE(&gpt_uuid_efi) },
- { ALIAS_FREEBSD, ALIAS_PTR2TYPE(&gpt_uuid_freebsd) },
- { ALIAS_FREEBSD_BOOT, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_boot) },
- { ALIAS_FREEBSD_NANDFS, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_nandfs) },
- { ALIAS_FREEBSD_SWAP, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_swap) },
- { ALIAS_FREEBSD_UFS, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_ufs) },
- { ALIAS_FREEBSD_VINUM, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_vinum) },
- { ALIAS_FREEBSD_ZFS, ALIAS_PTR2TYPE(&gpt_uuid_freebsd_zfs) },
+ { ALIAS_MIDNIGHTBSD, ALIAS_PTR2TYPE(&gpt_uuid_mnbsd) },
+ { ALIAS_MIDNIGHTBSD_BOOT, ALIAS_PTR2TYPE(&gpt_uuid_mnbsd_boot) },
+ { ALIAS_MIDNIGHTBSD_NANDFS, ALIAS_PTR2TYPE(&gpt_uuid_mnbsd_nandfs) },
+ { ALIAS_MIDNIGHTBSD_SWAP, ALIAS_PTR2TYPE(&gpt_uuid_mnbsd_swap) },
+ { ALIAS_MIDNIGHTBSD_UFS, ALIAS_PTR2TYPE(&gpt_uuid_mnbsd_ufs) },
+ { ALIAS_MIDNIGHTBSD_VINUM, ALIAS_PTR2TYPE(&gpt_uuid_mnbsd_vinum) },
+ { ALIAS_MIDNIGHTBSD_ZFS, ALIAS_PTR2TYPE(&gpt_uuid_mnbsd_zfs) },
{ ALIAS_MBR, ALIAS_PTR2TYPE(&gpt_uuid_mbr) },
{ ALIAS_NTFS, ALIAS_PTR2TYPE(&gpt_uuid_ms_basic_data) },
{ ALIAS_NONE, 0 } /* Keep last! */
Modified: trunk/usr.bin/mkimg/mbr.c
===================================================================
--- trunk/usr.bin/mkimg/mbr.c 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/mbr.c 2018-07-29 16:24:06 UTC (rev 11976)
@@ -55,7 +55,7 @@
{ 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_MIDNIGHTBSD, ALIAS_INT2TYPE(DOSPTYP_386BSD) },
{ ALIAS_NTFS, ALIAS_INT2TYPE(DOSPTYP_NTFS) },
{ ALIAS_NONE, 0 } /* Keep last! */
};
Modified: trunk/usr.bin/mkimg/pc98.c
===================================================================
--- trunk/usr.bin/mkimg/pc98.c 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/pc98.c 2018-07-29 16:24:06 UTC (rev 11976)
@@ -56,7 +56,7 @@
#define PC98_BOOTCODESZ 8192
static struct mkimg_alias pc98_aliases[] = {
- { ALIAS_FREEBSD, ALIAS_INT2TYPE(PC98_PTYP_386BSD) },
+ { ALIAS_MIDNIGHTBSD, ALIAS_INT2TYPE(PC98_PTYP_386BSD) },
{ ALIAS_NONE, 0 }
};
Modified: trunk/usr.bin/mkimg/scheme.c
===================================================================
--- trunk/usr.bin/mkimg/scheme.c 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/scheme.c 2018-07-29 16:24:06 UTC (rev 11976)
@@ -53,13 +53,13 @@
{ "efi", ALIAS_EFI },
{ "fat16b", ALIAS_FAT16B },
{ "fat32", ALIAS_FAT32 },
- { "freebsd", ALIAS_FREEBSD },
- { "freebsd-boot", ALIAS_FREEBSD_BOOT },
- { "freebsd-nandfs", ALIAS_FREEBSD_NANDFS },
- { "freebsd-swap", ALIAS_FREEBSD_SWAP },
- { "freebsd-ufs", ALIAS_FREEBSD_UFS },
- { "freebsd-vinum", ALIAS_FREEBSD_VINUM },
- { "freebsd-zfs", ALIAS_FREEBSD_ZFS },
+ { "midnightbsd", ALIAS_MIDNIGHTBSD },
+ { "mnbsdboot", ALIAS_MIDNIGHTBSD_BOOT },
+ { "mnbsdnandfs", ALIAS_MIDNIGHTBSD_NANDFS },
+ { "mnbsdswap", ALIAS_MIDNIGHTBSD_SWAP },
+ { "mnbsdufs", ALIAS_MIDNIGHTBSD_UFS },
+ { "mnbsdvinum", ALIAS_MIDNIGHTBSD_VINUM },
+ { "mnbsdzfs", ALIAS_MIDNIGHTBSD_ZFS },
{ "mbr", ALIAS_MBR },
{ "ntfs", ALIAS_NTFS },
{ NULL, ALIAS_NONE } /* Keep last! */
Modified: trunk/usr.bin/mkimg/scheme.h
===================================================================
--- trunk/usr.bin/mkimg/scheme.h 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/scheme.h 2018-07-29 16:24:06 UTC (rev 11976)
@@ -39,13 +39,13 @@
ALIAS_EFI,
ALIAS_FAT16B,
ALIAS_FAT32,
- ALIAS_FREEBSD,
- ALIAS_FREEBSD_BOOT,
- ALIAS_FREEBSD_NANDFS,
- ALIAS_FREEBSD_SWAP,
- ALIAS_FREEBSD_UFS,
- ALIAS_FREEBSD_VINUM,
- ALIAS_FREEBSD_ZFS,
+ ALIAS_MIDNIGHTBSD,
+ ALIAS_MIDNIGHTBSD_BOOT,
+ ALIAS_MIDNIGHTBSD_NANDFS,
+ ALIAS_MIDNIGHTBSD_SWAP,
+ ALIAS_MIDNIGHTBSD_UFS,
+ ALIAS_MIDNIGHTBSD_VINUM,
+ ALIAS_MIDNIGHTBSD_ZFS,
ALIAS_MBR,
ALIAS_NTFS,
/* end */
Modified: trunk/usr.bin/mkimg/vtoc8.c
===================================================================
--- trunk/usr.bin/mkimg/vtoc8.c 2018-07-28 21:14:28 UTC (rev 11975)
+++ trunk/usr.bin/mkimg/vtoc8.c 2018-07-29 16:24:06 UTC (rev 11976)
@@ -41,16 +41,16 @@
#include "mkimg.h"
#include "scheme.h"
-#ifndef VTOC_TAG_FREEBSD_NANDFS
-#define VTOC_TAG_FREEBSD_NANDFS 0x0905
+#ifndef VTOC_TAG_MIDNIGHTBSD_NANDFS
+#define VTOC_TAG_MIDNIGHTBSD_NANDFS 0x0905
#endif
static struct mkimg_alias vtoc8_aliases[] = {
- { ALIAS_FREEBSD_NANDFS, ALIAS_INT2TYPE(VTOC_TAG_FREEBSD_NANDFS) },
- { ALIAS_FREEBSD_SWAP, ALIAS_INT2TYPE(VTOC_TAG_FREEBSD_SWAP) },
- { ALIAS_FREEBSD_UFS, ALIAS_INT2TYPE(VTOC_TAG_FREEBSD_UFS) },
- { ALIAS_FREEBSD_VINUM, ALIAS_INT2TYPE(VTOC_TAG_FREEBSD_VINUM) },
- { ALIAS_FREEBSD_ZFS, ALIAS_INT2TYPE(VTOC_TAG_FREEBSD_NANDFS) },
+ { ALIAS_MIDNIGHTBSD_NANDFS, ALIAS_INT2TYPE(VTOC_TAG_MIDNIGHTBSD_NANDFS) },
+ { ALIAS_MIDNIGHTBSD_SWAP, ALIAS_INT2TYPE(VTOC_TAG_MIDNIGHTBSD_SWAP) },
+ { ALIAS_MIDNIGHTBSD_UFS, ALIAS_INT2TYPE(VTOC_TAG_MIDNIGHTBSD_UFS) },
+ { ALIAS_MIDNIGHTBSD_VINUM, ALIAS_INT2TYPE(VTOC_TAG_MIDNIGHTBSD_VINUM) },
+ { ALIAS_MIDNIGHTBSD_ZFS, ALIAS_INT2TYPE(VTOC_TAG_MIDNIGHTBSD_NANDFS) },
{ ALIAS_NONE, 0 }
};
More information about the Midnightbsd-cvs
mailing list