Author: emaste
Date: Thu Sep 17 19:41:10 2020
New Revision: 365847
URL: https://svnweb.freebsd.org/changeset/base/365847

Log:
  makefs: connect cd9660 El Torito EFI boot image system type
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
  head/usr.sbin/makefs/makefs.8

Modified: head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
==============================================================================
--- head/usr.sbin/makefs/cd9660/cd9660_eltorito.c       Thu Sep 17 18:47:23 
2020        (r365846)
+++ head/usr.sbin/makefs/cd9660/cd9660_eltorito.c       Thu Sep 17 19:41:10 
2020        (r365847)
@@ -107,9 +107,11 @@ cd9660_add_boot_disk(iso9660_disk *diskStructure, cons
        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;

Modified: head/usr.sbin/makefs/makefs.8
==============================================================================
--- head/usr.sbin/makefs/makefs.8       Thu Sep 17 18:47:23 2020        
(r365846)
+++ head/usr.sbin/makefs/makefs.8       Thu Sep 17 19:41:10 2020        
(r365847)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to