From 53d8e037b10795e2a30c5d1d3ed06f887bc17103 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Thu, 17 Sep 2020 19:41:10 +0000 Subject: [PATCH] makefs: connect cd9660 El Torito EFI boot image system type Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 4 +++- usr.sbin/makefs/makefs.8 | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index f5d7104b3f68..3628a798db4c 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -107,9 +107,11 @@ cd9660_add_boot_disk(iso9660_disk *diskStructure, const char *boot_info) else if (strcmp(sysname, "macppc") == 0 || strcmp(sysname, "mac68k") == 0) new_image->system = ET_SYS_MAC; + else if (strcmp(sysname, "efi") == 0) + new_image->system = ET_SYS_EFI; else { warnx("boot disk system must be " - "i386, powerpc, macppc, or mac68k"); + "i386, powerpc, macppc, mac68k, or efi"); free(temp); free(new_image); return 0; diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index a687f98780e9..8c4fbcb7b322 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 20, 2019 +.Dd September 17, 2020 .Dt MAKEFS 8 .Os .Sh NAME @@ -385,8 +385,9 @@ is one of .Ql i386 , .Ql mac68k , .Ql macppc , +.Ql powerpc , or -.Ql powerpc . +.Ql efi . .It Sy generic-bootimage Load a generic boot image into the first 32K of the cd9660 image. .It Sy hard-disk-boot