[src/trunk]: src/sys/stand/efiboot Honour the timeout= entry in boot.cfg

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b680084f5598
branches:  trunk
changeset: 1024300:b680084f5598
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 17 14:12:54 2021 +0000

description:
Honour the timeout= entry in boot.cfg

diffstat:

 sys/stand/efiboot/Makefile.efiboot |  3 ++-
 sys/stand/efiboot/boot.c           |  5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r fd36fb64f261 -r b680084f5598 sys/stand/efiboot/Makefile.efiboot
--- a/sys/stand/efiboot/Makefile.efiboot        Sun Oct 17 14:12:21 2021 +0000
+++ b/sys/stand/efiboot/Makefile.efiboot        Sun Oct 17 14:12:54 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.24 2021/10/06 10:13:19 jmcneill Exp $
+# $NetBSD: Makefile.efiboot,v 1.25 2021/10/17 14:12:54 jmcneill Exp $
 
 S=             ${.CURDIR}/../../..
 
@@ -92,6 +92,7 @@
 CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
 CPPFLAGS+= -DLIBSA_FFS_EI
 CPPFLAGS+= -DLIBSA_DISKLABEL_EI
+CPPFLAGS+= -DDEFAULT_TIMEOUT=5
 
 #CPPFLAGS+= -DEFIBOOT_DEBUG
 #CPPFLAGS+= -DARP_DEBUG
diff -r fd36fb64f261 -r b680084f5598 sys/stand/efiboot/boot.c
--- a/sys/stand/efiboot/boot.c  Sun Oct 17 14:12:21 2021 +0000
+++ b/sys/stand/efiboot/boot.c  Sun Oct 17 14:12:54 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.39 2021/10/09 13:09:17 jmcneill Exp $       */
+/*     $NetBSD: boot.c,v 1.40 2021/10/17 14:12:54 jmcneill Exp $       */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -88,7 +88,6 @@
 static char netbsd_args[255];
 static char rndseed_path[255];
 
-#define        DEFTIMEOUT      5
 #define DEFFILENAME    names[0]
 
 int    set_bootfile(const char *);
@@ -549,7 +548,7 @@
                printf("booting %s%s%s - starting in ", netbsd_path,
                    netbsd_args[0] != '\0' ? " " : "", netbsd_args);
 
-               c = awaitkey(DEFTIMEOUT, 1);
+               c = awaitkey(bootcfg_info.timeout, 1);
                if (c != '\r' && c != '\n' && c != '\0')
                        bootprompt(); /* does not return */