aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2020-09-17 19:41:10 +0000
committerEd Maste <emaste@FreeBSD.org>2020-09-17 19:41:10 +0000
commit53d8e037b10795e2a30c5d1d3ed06f887bc17103 (patch)
tree8b650d476cf771c5ee6a5239b2501a6c010e0da6
parentdb853af62a612dc19b67c412d7c86676593a4b31 (diff)
downloadsrc-53d8e037b10795e2a30c5d1d3ed06f887bc17103.tar.gz
src-53d8e037b10795e2a30c5d1d3ed06f887bc17103.zip
makefs: connect cd9660 El Torito EFI boot image system type
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=365847
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_eltorito.c4
-rw-r--r--usr.sbin/makefs/makefs.85
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