Wed Apr 19 18:39:18 2023 UTC ()
Install /boot/boot.cfg with EFI bootloaders.

On ARM ports, the EFI boot loader handles a boot.cfg file if it
exists, but one is not installed by default.  In contrast, both the
i386 and amd64 ports do install boot.cfg by default.  Bring these
ports into agreement by installing boot.cfg on ARM ports with EFI boot
loaders.


(brook)
diff -r1.45 -r1.46 src/distrib/utils/embedded/conf/armv7.conf
diff -r0 -r1.1 src/distrib/utils/embedded/files/boot.cfg

cvs diff -r1.45 -r1.46 src/distrib/utils/embedded/conf/armv7.conf (expand / switch to context diff)
--- src/distrib/utils/embedded/conf/armv7.conf 2022/11/19 09:19:27 1.45
+++ src/distrib/utils/embedded/conf/armv7.conf 2023/04/19 18:39:18 1.46
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.45 2022/11/19 09:19:27 yamt Exp $
+# $NetBSD: armv7.conf,v 1.46 2023/04/19 18:39:18 brook Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -38,6 +38,7 @@
 		    >> "$tmp/selected_sets"
 
 		cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd
+		cp ${DIR}/files/boot.cfg ${mnt}/boot/boot.cfg
 	else
 		# Fallback to non-EFI boot command
 		cp ${DIR}/files/armv7_boot_nonefi.cmd ${mnt}/boot/boot.cmd

File Added: src/distrib/utils/embedded/files/boot.cfg
menu=Boot normally:rndseed /var/db/entropy-file;boot
menu=Boot single user:rndseed /var/db/entropy-file;boot -s
menu=Drop to boot prompt:prompt
default=1
timeout=5
clear=1