summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorbrook <brook@NetBSD.org>2023-04-19 18:39:18 +0000
committerbrook <brook@NetBSD.org>2023-04-19 18:39:18 +0000
commit88e78a9944cc3c74ce2a132c5a93bce17306d8c6 (patch)
treeb2ef2fddc9cd4a88cf9f56afa863ef0570e5f850 /distrib
parent8ac4154f3b05fc5223b1f42f5dfbb6ceac377ade (diff)
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.
Diffstat (limited to 'distrib')
-rw-r--r--distrib/utils/embedded/conf/armv7.conf3
-rw-r--r--distrib/utils/embedded/files/boot.cfg6
2 files changed, 8 insertions, 1 deletions
diff --git a/distrib/utils/embedded/conf/armv7.conf b/distrib/utils/embedded/conf/armv7.conf
index 70d56c7d58d..ac33efd8888 100644
--- a/distrib/utils/embedded/conf/armv7.conf
+++ b/distrib/utils/embedded/conf/armv7.conf
@@ -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
diff --git a/distrib/utils/embedded/files/boot.cfg b/distrib/utils/embedded/files/boot.cfg
new file mode 100644
index 00000000000..cf6db5740e6
--- /dev/null
+++ b/distrib/utils/embedded/files/boot.cfg
@@ -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