Module Name:    src
Committed By:   maya
Date:           Sat Apr 13 18:38:17 UTC 2024

Modified Files:
        src/distrib/amd64/liveimage: Makefile.liveimage

Log Message:
amd64 live image: support EFI as well as BIOS boot

The biggest caveat is that there's a small number of machines that try to
EFI boot but fail, so would prefer a BIOS only image. I'm not adding a
separate BIOS only image because the live image is pretty niche.
(For regular installation images, we do create a separate BIOS-only version)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amd64/liveimage/Makefile.liveimage
diff -u src/distrib/amd64/liveimage/Makefile.liveimage:1.2 src/distrib/amd64/liveimage/Makefile.liveimage:1.3
--- src/distrib/amd64/liveimage/Makefile.liveimage:1.2	Sat Dec 15 18:03:17 2018
+++ src/distrib/amd64/liveimage/Makefile.liveimage	Sat Apr 13 18:38:17 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.liveimage,v 1.2 2018/12/15 18:03:17 gson Exp $
+#	$NetBSD: Makefile.liveimage,v 1.3 2024/04/13 18:38:17 maya Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,11 @@ PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot
 SECONDARY_BOOT_ARG=	# unnecessary
 
+EFIBOOT=		${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+=		${WORKDIR}/usr/mdec/bootia32.efi
+
 USE_MBR=		yes
+USE_GPT=		yes
+USE_GPTMBR=		yes
 
 .include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"

Reply via email to