Skip to content

Commit

Permalink
fix partition uuids
Browse files Browse the repository at this point in the history
  • Loading branch information
@laffer1
laffer1 committed Nov 19, 2024
1 parent 742005a commit f595c8c
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 145 deletions.
2 changes: 1 addition & 1 deletion usr.bin/mkimg/apm.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*-
/-
* Copyright (c) 2014 Juniper Networks, Inc.
* All rights reserved.
*
Expand Down
28 changes: 14 additions & 14 deletions usr.bin/mkimg/gpt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,26 @@
#include "scheme.h"

static mkimg_uuid_t gpt_uuid_efi = GPT_ENT_TYPE_EFI;
static mkimg_uuid_t gpt_uuid_freebsd = GPT_ENT_TYPE_FREEBSD;
static mkimg_uuid_t gpt_uuid_freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT;
static mkimg_uuid_t gpt_uuid_freebsd_nandfs = GPT_ENT_TYPE_FREEBSD_NANDFS;
static mkimg_uuid_t gpt_uuid_freebsd_swap = GPT_ENT_TYPE_FREEBSD_SWAP;
static mkimg_uuid_t gpt_uuid_freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS;
static mkimg_uuid_t gpt_uuid_freebsd_vinum = GPT_ENT_TYPE_FREEBSD_VINUM;
static mkimg_uuid_t gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS;
static mkimg_uuid_t gpt_uuid_mnbsd = GPT_ENT_TYPE_MIDNIGHTBSD;
static mkimg_uuid_t gpt_uuid_mnbsd_boot = GPT_ENT_TYPE_MIDNIGHTBSD_BOOT;
static mkimg_uuid_t gpt_uuid_mnbsd_nandfs = GPT_ENT_TYPE_MIDNIGHTBSD_NANDFS;
static mkimg_uuid_t gpt_uuid_mnbsd_swap = GPT_ENT_TYPE_MIDNIGHTBSD_SWAP;
static mkimg_uuid_t gpt_uuid_mnbsd_ufs = GPT_ENT_TYPE_MIDNIGHTBSD_UFS;
static mkimg_uuid_t gpt_uuid_mnbsd_vinum = GPT_ENT_TYPE_MIDNIGHTBSD_VINUM;
static mkimg_uuid_t gpt_uuid_mnbsd_zfs = GPT_ENT_TYPE_MIDNIGHTBSD_ZFS;
static mkimg_uuid_t gpt_uuid_mbr = GPT_ENT_TYPE_MBR;
static mkimg_uuid_t gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA;
static mkimg_uuid_t gpt_uuid_prep_boot = GPT_ENT_TYPE_PREP_BOOT;

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_PPCBOOT, ALIAS_PTR2TYPE(&gpt_uuid_prep_boot) },
Expand Down
14 changes: 7 additions & 7 deletions usr.bin/mkimg/scheme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ static struct {
{ "fat16b", ALIAS_FAT16B },
{ "fat32", ALIAS_FAT32 },
{ "fat32lba", ALIAS_FAT32LBA },
{ "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 },
{ "mnbsd-boot", ALIAS_MIDNIGHTBSD_BOOT },
{ "mnbsd-nandfs", ALIAS_MIDNIGHTBSD_NANDFS },
{ "mnbsd-swap", ALIAS_MIDNIGHTBSD_SWAP },
{ "mnbsd-ufs", ALIAS_MIDNIGHTBSD_UFS },
{ "mnbsd-vinum", ALIAS_MIDNIGHTBSD_VINUM },
{ "mnbsd-zfs", ALIAS_MIDNIGHTBSD_ZFS },
{ "mbr", ALIAS_MBR },
{ "ntfs", ALIAS_NTFS },
{ "prepboot", ALIAS_PPCBOOT },
Expand Down
14 changes: 7 additions & 7 deletions usr.bin/mkimg/scheme.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ enum alias {
ALIAS_FAT16B,
ALIAS_FAT32,
ALIAS_FAT32LBA,
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,
ALIAS_PPCBOOT,
Expand Down
116 changes: 0 additions & 116 deletions usr.bin/mkimg/vtoc8.c
View file

This file was deleted.

0 comments on commit f595c8c

Please sign in to comment.