makefs: set the validation entry system type
Obtained from: NetBSD c3cb4dcc9c43 Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
1d1ffa2efd
commit
22db5e5d03
@ -374,6 +374,7 @@ cd9660_setup_boot(iso9660_disk *diskStructure, int first_sector)
|
|||||||
struct boot_catalog_entry *x86_head, *mac_head, *ppc_head, *efi_head,
|
struct boot_catalog_entry *x86_head, *mac_head, *ppc_head, *efi_head,
|
||||||
*valid_entry, *default_entry, *temp, *head, **headp, *next;
|
*valid_entry, *default_entry, *temp, *head, **headp, *next;
|
||||||
struct cd9660_boot_image *tmp_disk;
|
struct cd9660_boot_image *tmp_disk;
|
||||||
|
uint8_t system;
|
||||||
|
|
||||||
headp = NULL;
|
headp = NULL;
|
||||||
x86_head = mac_head = ppc_head = efi_head = NULL;
|
x86_head = mac_head = ppc_head = efi_head = NULL;
|
||||||
@ -388,9 +389,16 @@ cd9660_setup_boot(iso9660_disk *diskStructure, int first_sector)
|
|||||||
cd9660_731(first_sector,
|
cd9660_731(first_sector,
|
||||||
diskStructure->boot_descriptor->boot_catalog_pointer);
|
diskStructure->boot_descriptor->boot_catalog_pointer);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Use system type of default image for validation entry. Fallback to
|
||||||
|
* X86 system type if not found.
|
||||||
|
*/
|
||||||
|
system = default_boot_image != NULL ? default_boot_image->system :
|
||||||
|
ET_SYS_X86;
|
||||||
|
|
||||||
/* Step 1: Generate boot catalog */
|
/* Step 1: Generate boot catalog */
|
||||||
/* Step 1a: Validation entry */
|
/* Step 1a: Validation entry */
|
||||||
valid_entry = cd9660_boot_setup_validation_entry(ET_SYS_X86);
|
valid_entry = cd9660_boot_setup_validation_entry(system);
|
||||||
if (valid_entry == NULL)
|
if (valid_entry == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user