Module Name: src
Committed By: jmcneill
Date: Sun Oct 17 14:12:54 UTC 2021
Modified Files:
src/sys/stand/efiboot: Makefile.efiboot boot.c
Log Message:
Honour the timeout= entry in boot.cfg
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.39 -r1.40 src/sys/stand/efiboot/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/Makefile.efiboot
diff -u src/sys/stand/efiboot/Makefile.efiboot:1.24 src/sys/stand/efiboot/Makefile.efiboot:1.25
--- src/sys/stand/efiboot/Makefile.efiboot:1.24 Wed Oct 6 10:13:19 2021
+++ src/sys/stand/efiboot/Makefile.efiboot Sun Oct 17 14:12:54 2021
@@ -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+= -DSUPPORT_TFTP
CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
CPPFLAGS+= -DLIBSA_FFS_EI
CPPFLAGS+= -DLIBSA_DISKLABEL_EI
+CPPFLAGS+= -DDEFAULT_TIMEOUT=5
#CPPFLAGS+= -DEFIBOOT_DEBUG
#CPPFLAGS+= -DARP_DEBUG
Index: src/sys/stand/efiboot/boot.c
diff -u src/sys/stand/efiboot/boot.c:1.39 src/sys/stand/efiboot/boot.c:1.40
--- src/sys/stand/efiboot/boot.c:1.39 Sat Oct 9 13:09:17 2021
+++ src/sys/stand/efiboot/boot.c Sun Oct 17 14:12:54 2021
@@ -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 <non...@netbsd.org>
@@ -88,7 +88,6 @@ static char netbsd_path[255];
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 @@ boot(void)
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 */
