Module Name: src
Committed By: brook
Date: Wed Apr 19 18:39:18 UTC 2023
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Added Files:
src/distrib/utils/embedded/files: boot.cfg
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r0 -r1.1 src/distrib/utils/embedded/files/boot.cfg
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.45 src/distrib/utils/embedded/conf/armv7.conf:1.46
--- src/distrib/utils/embedded/conf/armv7.conf:1.45 Sat Nov 19 09:19:27 2022
+++ src/distrib/utils/embedded/conf/armv7.conf Wed Apr 19 18:39:18 2023
@@ -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 @@ populate_common() {
>> "$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
Added files:
Index: src/distrib/utils/embedded/files/boot.cfg
diff -u /dev/null src/distrib/utils/embedded/files/boot.cfg:1.1
--- /dev/null Wed Apr 19 18:39:19 2023
+++ src/distrib/utils/embedded/files/boot.cfg Wed Apr 19 18:39:18 2023
@@ -0,0 +1,6 @@
+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
