From nobody Sat Oct 03 10:55:26 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 4hxjH26QW3z6vBD8 for ; Sat, 03 Oct 2026 10:55:26 +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 4hxjH25twPz4sKf for ; Sat, 03 Oct 2026 10:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791024926; 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=pJi1E/SNUSKa8s2Z5Q3bwO5tfW2zhiYcXsYpd2unsek=; b=HSOWAyCvkpwlzHfKNMIV5bVcbQ8ixQIPC8wmPPD7sBBeZKzV0qMAcTx5nyabyq8hgklTJw VEEMwqUWk8Ygg0K51+JnDH7QSP0oy0EKcBqAfnVCLUEee/wdlYgKk7caEnDvKvbNFlUznW K3yR+3LhT8TwZ81M6tOXMVCbhV+juOOFW9BPamawunNSEpQ6RdWZHFa+dRydut8aKFS0Vr UNDoL3ZaiEbrTQeZ79CxxGh7ciV0y7Ze8Nv3PJun7+YCWzb8DdE+zyFuVlTbppqEYTUjGC qtt3LsAOHRMQO1eTxb0iSO0k5sLekg2mST9ePB//W4LBB7DkXpPOm0dRL8ge7A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791024926; b=yE0vqPphJGsjeoafTgjBiURrO3R9XW1eDua6UGjTEbZwAsy+Qmme5c5bwz0gtERN/6Eoql MLdtfoI5XHQmu8MPcQI3vRFnLujG9b7HiqUnqQYDOLAfj/iXgXP/vQ48UKmFwV3bkrxTkj Q3epWk0i6YdTRCnlJtx+WT1O0MRCWexJhKFdpdwTR0r4S9dPWU/1rf6rh6y+xO3z9NmId0 6h7A/b/+Z3r5WDxdKEF+ctdXdc6gPef3+O4vYUvr7gU+aj+Dz73o+zu32H0V1/on/FJoGc be4Lg/y+Lzr/TB0r+4f3jRjkv4WbPnximkdFUj3Pz+h6ENjgBvHQyfCeHLL69Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791024926; 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=pJi1E/SNUSKa8s2Z5Q3bwO5tfW2zhiYcXsYpd2unsek=; b=tgI5AB726yHjs9zJf/T7QVToR2RvPjcbCwwqp0D9TAaiJTIqWMOlOJCUP+TXCshiy+DiDR Xl9+M0YstbM63AF9IrJsIVD6RZlItOjMG4xo3RhhWf3ldRBge3p8HubIw/c9YYnYot83Fz L5zo70WEAaGfeTDETVedKcmMbJEuhij5ScPc5ZpkcRr6yXFAH5vOxuFjqm/AHp78c6a58R lAbqEdkGQ7qqz4cpX7QUBUV466N3WJGl2TFA+oTm6Uay3bpyOEvEq7gA5LR1QfoP0zc2OO wG2tsIiB/7N/0lz62aUxAYo7gksOaFM3/nX080hV21dbOLeRhMeWStGt75KlaA== 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 4hxjH24wBNz11MD for ; Sat, 03 Oct 2026 10:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cd7f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 10:55:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: 49276e4b3638 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 49276e4b3638d5b319d51bb00777446c9691c331 Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 10:55:26 +0000 Message-Id: <6ac0df1e.1cd7f.f5c704f@gitrepo.freebsd.org> The branch stable/15 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=49276e4b3638d5b319d51bb00777446c9691c331 commit 49276e4b3638d5b319d51bb00777446c9691c331 Author: Roman Bogorodskiy AuthorDate: 2026-08-27 17:40:43 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-10-03 08:24:17 +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); }