From nobody Sat Oct 03 12:20:50 2026 X-Original-To: dev-commits-src-branches@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 4hxl9Z3vVmz6vKd4 for ; Sat, 03 Oct 2026 12:20:50 +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 4hxl9Z3S6bz3KRb for ; Sat, 03 Oct 2026 12:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791030050; 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=GrdvRJkIZqhw8f+HobjyIBFJCLb91zsXRj15ngfMDSw=; b=b+7Oix5naQwU+LTNd/EZjlzFkryWKbG5/K7JMPrDrXVb5Ol4mlNi9sVgHLplfqwLwOH1mK Fqqggb1SnSeaxO7AnVnd4q3a4+/hp6ibx1RLcWQ6xPsoWOMwunJquGfClS0uhuTgUwWKJF ext0P5CY1KNHlms/hVuqyDU6XLUiEl7+FUAnmmyjmTvVGwoYn29pmUxY2UYwxExz2EaC+E puA0xF+vq8VxFob67moqXKN/XD+16O0kmUGEivdN8UHm8+9zDiZzHN6TRBJ8AQsaf11bkj tHsdoBPHRHwxxHRc0roUqtTLWyv/4euQgmIaijo1UKGKTm2Psh3ToyoDgbEG6g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791030050; b=FeeB3e74gXH8c9x6DauWnaAOo8qJh+1CywkLRm8H2xFw3YepS1sF84Hep4AoZR3zDzdOxp d5mYM+EB1SUmeiRfhZg0TjrI5CNvJ9XVAnPczEpSfDRYGu0F0drxOFJQ17SsX4LedYMvL/ 6PjbffF8o4A6nwTaFemasl30WYbboEf4FLrAkba9CBRVWA5YYOH7B1numK/HXI9fNcnov9 5bWQjcrP1m5LC25UO66L6xduS29TVXK2Rb5YMWlu08jq4I/MOyUsAC7g94DVQIiMhAKfH4 l6y691tlTdAN6YPqCUA2vIbHFi5O3XMDz4TcIioJInPmK+d/9KGA2+359p1Bcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791030050; 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=GrdvRJkIZqhw8f+HobjyIBFJCLb91zsXRj15ngfMDSw=; b=HTft5L8ZXHZgXeYS0wuS044w1YH03XxeUvB2bIFvLqoyqnXNMYW/RB41Fa2U+PLuASaTq2 Tr24ZrRyVaWIomtpJyacOcKpgpaZvkBF8/p5MfRNcer0s0PiMV+iFIDDh2Vp0sFyIGnjDv GYpj6LqG//FB9Zq2aOaCwksSfVabaxtLDWi1fBAzkxaGUqmJlys2LOEux7otNT8hhLLWM8 IRnL3KEtZ5QiQqKgR0AB62DQs/ztEx/w6CM/hhNKOfqHKXA2JUdQ4LutUsZvrFpS2kv0Vu ETLgxMBZKfx3mzMEdNPBmc35JNoBU2lQ1k8o1uvJAuIwqGyl+SYIL1SDgPYr4Q== 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 4hxl9Z2XtDz13X4 for ; Sat, 03 Oct 2026 12:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24c36 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 12:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: 4c46d1aac783 - stable/14 - bhyveload: do not hang on EOF from console input List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: novel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c46d1aac7831da0c31b10d99dfd0780b1972ab9 Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 12:20:50 +0000 Message-Id: <6ac0f322.24c36.e843904@gitrepo.freebsd.org> The branch stable/14 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=4c46d1aac7831da0c31b10d99dfd0780b1972ab9 commit 4c46d1aac7831da0c31b10d99dfd0780b1972ab9 Author: Roman Bogorodskiy AuthorDate: 2026-08-27 17:40:43 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-10-03 10:54:53 +0000 bhyveload: do not hang on EOF from console input Currently, when bhyveload(8) fails to boot the guest, it drops into the loader prompt waiting for user input. This behaviour is inconvenient when using bhyveload(8) from scripts. Make it exit when it receives EOF from console input. PR: 286289 Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59226 (cherry picked from commit 8c20260bc55d7b4be0cbcf0a940505ae15ab41a9) --- usr.sbin/bhyveload/bhyveload.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index be99bb342de6..3ee5f7ac7129 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -134,8 +134,12 @@ static int cb_getc(void *arg __unused) { char c; + ssize_t nread; - if (read(consin_fd, &c, 1) == 1) + nread = read(consin_fd, &c, 1); + if (nread == 0) + cb_exit(NULL, USERBOOT_EXIT_QUIT); + if (nread == 1) return (c); return (-1); }