Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/utils/embedded Install /boot/boot.cfg with EFI bootl...



details:   https://anonhg.NetBSD.org/src/rev/b4f931970eb1
branches:  trunk
changeset: 374341:b4f931970eb1
user:      brook <brook%NetBSD.org@localhost>
date:      Wed Apr 19 18:39:18 2023 +0000

description:
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:

 distrib/utils/embedded/conf/armv7.conf |  3 ++-
 distrib/utils/embedded/files/boot.cfg  |  6 ++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r e3da7576484b -r b4f931970eb1 distrib/utils/embedded/conf/armv7.conf
--- a/distrib/utils/embedded/conf/armv7.conf    Wed Apr 19 09:39:29 2023 +0000
+++ b/distrib/utils/embedded/conf/armv7.conf    Wed Apr 19 18:39:18 2023 +0000
@@ -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 -r e3da7576484b -r b4f931970eb1 distrib/utils/embedded/files/boot.cfg
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/utils/embedded/files/boot.cfg     Wed Apr 19 18:39:18 2023 +0000
@@ -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



Home | Main Index | Thread Index | Old Index