Module Name: src
Committed By: jmcneill
Date: Sat Jan 25 10:53:13 UTC 2020
Modified Files:
src/sys/stand/efiboot: exec.c
Log Message:
Hide the twiddle while loading efiboot plist
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/stand/efiboot/exec.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/exec.c
diff -u src/sys/stand/efiboot/exec.c:1.12 src/sys/stand/efiboot/exec.c:1.13
--- src/sys/stand/efiboot/exec.c:1.12 Wed Dec 18 21:46:03 2019
+++ src/sys/stand/efiboot/exec.c Sat Jan 25 10:53:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.12 2019/12/18 21:46:03 riastradh Exp $ */
+/* $NetBSD: exec.c,v 1.13 2020/01/25 10:53:13 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jason R. Thorpe
@@ -34,6 +34,8 @@
#include <sys/reboot.h>
+extern char twiddle_toggle;
+
u_long load_offset = 0;
#define FDT_SPACE (4 * 1024 * 1024)
@@ -127,6 +129,7 @@ load_efibootplist(bool default_fallback)
u_long plist_size = 0;
prop_dictionary_t plist = NULL, oplist = NULL;
bool load_quietly = false;
+ bool old_twiddle_toggle = twiddle_toggle;
const char *path = get_efibootplist_path();
if (path == NULL || strlen(path) == 0) {
@@ -136,6 +139,8 @@ load_efibootplist(bool default_fallback)
load_quietly = true;
}
+ twiddle_toggle = load_quietly;
+
/*
* Fudge the size so we can ensure the resulting buffer
* is NUL-terminated for convenience.
@@ -157,6 +162,8 @@ load_efibootplist(bool default_fallback)
out:
oplist = efibootplist;
+ twiddle_toggle = old_twiddle_toggle;
+
/*
* If we had a failure, create an empty one for
* convenience. But a failure should not clobber
