From nobody Fri Sep 11 05:04:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hh2XL194pz6rbW6 for ; Fri, 11 Sep 2026 05:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hh2XK4MSXz4BsG for ; Fri, 11 Sep 2026 05:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789103073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MCAinQWXZK/6GVliZZfaT1h0/gjmL7rOU6EVBtICvt0=; b=DGDruZm8uF6Qh7BBQsLQypRYpPi7ZrEd92/lzloXj/asyHt6vMH7fHpHSfB3uz4M2LZOUQ RcMPZjA0SS+073YnuV7ZEbiSJNl0YDJOaoH9X5qA/LtiHH07/F5020fDMZCcAOTVEvS6Qr lxr+j8wMulKEUlxiM9/mZHu4nq26nFrjzM7qV/M+OY/0+fFhuOtdBj3SvuVn5ettnCJi74 RTynK5Y6Ab6vo1ZtB1OQXFwW0/MmOi95kG3JThyGEpfe3KEbMMOIRKl6cbz/yu8Qf5hlB2 3vvU81C+0hBThSvFzekRvoTb+qwBrQ9PVMgdPm0vz5q0bkHdAiggPyMq2YvTBw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789103073; b=n5SveI+iykoU3MXHSCpEKsOJ05gYR88SuTFAZ/GblJERwQ5Wuwd+uprw0uJzYGhHENovtA zwLV8Bz7gf69bn3cyIf8FZe8KOt6BAPG02i/sQ3xxQKkIRIxTED3w3lBqO7TsHt5lk5wSb UhOsAKE7tb33BtUfLNlBu7h05sUnpwSkOhn4P25lX0l1vYGhR2oq5nSszuAm/7//YGi8cY uBk7W5VUiZ6dnB7kcPOIGqkLEBYvtt2YVVlcRazunsl6JyoJrQN5fkTm83FQ06xiWwn+hg wmRM0pEuvX/NL+ER7UWx2O39pEtgb7ONhvsmRSUvsTXqP3XguIyVZDV5+6Ezzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789103073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MCAinQWXZK/6GVliZZfaT1h0/gjmL7rOU6EVBtICvt0=; b=k6ZU2oIR7CTO/hm7rzmgX07Gh1Ho3w226tWmhPndPzj1ajSfQSl6b/mkmUjcQnLpe66z9j l96+TZD6v/mdJo/maoQ5kuY531UjmhndQiDv93iaF6IELjjy5plw7sMam0kCwGxxrkm630 rUopnOx9SO0OLAQvWhKTv7YkQEOJ/D6sE9BvIEW93IzDsfKcSAmJ/I4U/88K0d22ldqVf5 DLo1VoiPWe1e7q36xgtM2R8RcQDkUX/U2HoMOsmncCRIcYkrFaiDICoRJs4RZtzdSdc/P0 TB3WnW0mo78EnQLmdPW8HaJWXlALkm9wShrwoCPwZK6tveBWjF7AZavGo9FxtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hh2XK3S7Cz10WM for ; Fri, 11 Sep 2026 05:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 11 Sep 2026 05:04:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0ca12047beb9 - main - loader.efi: Eat the character used to break to OK List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ca12047beb97f3e8dd19d272bafeea045b27252 Auto-Submitted: auto-generated Date: Fri, 11 Sep 2026 05:04:33 +0000 Message-Id: <6aa38be1.3ad60.5de5626e@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0ca12047beb97f3e8dd19d272bafeea045b27252 commit 0ca12047beb97f3e8dd19d272bafeea045b27252 Author: Warner Losh AuthorDate: 2026-09-11 04:14:45 +0000 Commit: Warner Losh CommitDate: 2026-09-11 04:15:29 +0000 loader.efi: Eat the character used to break to OK When we can't find root, we give the user a chance to drop to the boot loader OK prompt. We should eat the character that's pressed to not interfere with the interactive session. Sponsored by: Netflix --- stand/efi/loader/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 0714b6647c13..95aa64191fe5 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -779,8 +779,10 @@ interactive_interrupt(const char *msg) } /* XXX no pause or timeout wait for char */ - if (ischar()) + if (ischar()) { + (void)getchar(); return (true); + } now = getsecs(); } while (now - then < fail_timeout); return (false);