Page MenuHomeFreeBSD
Files F148723135

D14809.diff
No OneTemporary
Actions

D14809.diff
View Options

Index: head/release/amd64/mkisoimages.sh
===================================================================
--- head/release/amd64/mkisoimages.sh
+++ head/release/amd64/mkisoimages.sh
@@ -38,7 +38,7 @@
umount efi
rmdir efi
mdconfig -d -u $device
- bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable"
+ bootable="-o bootimage=efi;efiboot.img -o no-emul-boot $bootable"
shift
else
Index: head/usr.sbin/makefs/cd9660/cd9660_eltorito.h
===================================================================
--- head/usr.sbin/makefs/cd9660/cd9660_eltorito.h
+++ head/usr.sbin/makefs/cd9660/cd9660_eltorito.h
@@ -44,6 +44,7 @@
#define ET_SYS_X86 0
#define ET_SYS_PPC 1
#define ET_SYS_MAC 2
+#define ET_SYS_UEFI 0xef
#define ET_BOOT_ENTRY_SIZE 0x20
Index: head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
===================================================================
--- head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -104,9 +104,12 @@
else if (strcmp(sysname, "macppc") == 0 ||
strcmp(sysname, "mac68k") == 0)
new_image->system = ET_SYS_MAC;
+ else if (strcmp(sysname, "efi") == 0 ||
+ strcmp(sysname, "uefi") == 0)
+ new_image->system = ET_SYS_UEFI;
else {
warnx("boot disk system must be "
- "i386, powerpc, macppc, or mac68k");
+ "efi, i386, powerpc, macppc, mac68k");
free(temp);
free(new_image);
return 0;
@@ -338,12 +341,12 @@
int used_sectors;
int num_entries = 0;
int catalog_sectors;
- struct boot_catalog_entry *x86_head, *mac_head, *ppc_head,
+ struct boot_catalog_entry *x86_head, *mac_head, *ppc_head, *uefi_head,
*valid_entry, *default_entry, *temp, *head, **headp, *next;
struct cd9660_boot_image *tmp_disk;
headp = NULL;
- x86_head = mac_head = ppc_head = NULL;
+ x86_head = mac_head = ppc_head = uefi_head = NULL;
/* If there are no boot disks, don't bother building boot information */
if (TAILQ_EMPTY(&diskStructure->boot_images))
@@ -421,6 +424,9 @@
break;
case ET_SYS_MAC:
headp = &mac_head;
+ break;
+ case ET_SYS_UEFI:
+ headp = &uefi_head;
break;
default:
warnx("%s: internal error: unknown system type",

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 20, 8:44 PM (15 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30041171
Default Alt Text
D14809.diff (2 KB)

Event Timeline