From nobody Sat Oct 03 10:55:26 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 4hxjH772yXz6v9yq for ; Sat, 03 Oct 2026 10:55:31 +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 4hxjH76VCkz4sHK for ; Sat, 03 Oct 2026 10:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791024931; 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=lWeDoSEhh3pq+6s8SoAvprBAj7Wmc2wm7TRgs6cD68htmWJA6oWbVjXYxe84NBmR2Y7j2V u6CVJtMo8t5Pg0Me+2rnjs/if4OigauUC8TwnkFDaNPznNeu+0F2PMiI0MmvUoINqDnBAU BWz1qYI+vVw5X1aW0bhhi6r93hN8uv7/6OpZNBFetLHCNuIqq+dsY8E1CjG4P/nls+sKqD MM7vvBuHwPJsIgIUI9epJI7IGITKdmTIX58NPqg481bxhkHuUxpGh4IVMXMRn1XDxAJ1Oh IDnwRH/EHfkVqA7aAgXA4HGdk+yJJcz5Xv6tLSGYPTG0ACOoiomDtXmNyh2DBw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791024931; b=g1+Q/yU0p+F8TQnj+3UfqVnxLKoBsUuCO3dzWvrolFysuYyJR84SpiyK+2oh8wwrwdZQzl doMq0Kgo0gTFt+c8jUWUaKq/DLEFhcwm7OVEfdh7UCsL5GqR56aIxoS9c/7sXMt59oaUok Myf7K+U2M4t3zu6DzmSvsf2KB4rC+O7L77ktboZk315DNW8oo925PcOGWc/bAtN3d8i8jB txWgXTMzV4+v4bSTxMiLbDoK7d+QfI+5WrmHNtFcpC2tOhYdFs3FAlrcbcBIXq9fXCQgCY 4vyTmMQlgBS1jsc95NtXkzvvnXIyqkcA/V9VLW93IiqqSNKgvdlh322WoNw+qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791024931; 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=XQcyBaarcOWCv63xTvuUKYll8DklDKgSRtnqgbH0LO8D9IpEyL5OqFpygP0DNDSdgvUVxP S4O2dIElbVGsTOsIZpZ8vDKzV8R5EHazem+Xd7BJQedMRzSQWQHPgBUqXoVXtYS/V0yCPU MrPlax68EGgVfLwsv8jqz5MmNHIWe43Ir+8BhC9NuV/HFSNiQM/paFWCYdKSo6B3x5N923 9WiQ63z4jT0MDRXy9tuw9aqbuZS4pitdyqV2ip4eJER2r2nllRThV+I+vn/kg28q8ic05N J0wP6fM8L8VLyQgBG93exw8nxPcIPNJ72d4T68Y2K16f3NwCQeBT+Bd2kxUzEQ== 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 4hxjH75PYrz11Sv for ; Sat, 03 Oct 2026 10:55:31 +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: 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: 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); }