From nobody Tue Jun 24 19:34:09 2025 X-Original-To: dev-commits-src-main@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 4bRZrd4zvfz60B6G; Tue, 24 Jun 2025 19:34:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRZrd38H9z42KL; Tue, 24 Jun 2025 19:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750793649; 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=ruKk0n+zL3DIYac+JqSF+yrgzFh/+P4IOUF0iYwhVqA=; b=FgU7W3/GET1Dh2ED9NT7r+8/HeXZpv0NogPSm7nR7k5diUXTj3urMTZGYT2yEAKqPJeClU wUbEiIrGxtF8rjB9KGFsvoahwkJfu0QH/XMNf6KRAXyoQNpA6wllI5F8r8hOKzt3ePeNVL DLBKR+DS6TfPvTgMoxrr11NdtRawJ7pZ5FcpO3kcY9cAf5kkihgB72wMkXdOowrdlLFeGt uGMTTFzXBZJTE53IDfkutsCuoa2vPXXAqfykZcUvGCiaOdG+We54WAl9kgBvxWddraNmTl TpVJTRPyWZYND4u2DVwRRxeT8HPB2PMH3368OyAwf1lvMvQ1Z8yHTVIdYmObYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750793649; 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=ruKk0n+zL3DIYac+JqSF+yrgzFh/+P4IOUF0iYwhVqA=; b=Zz3lEHXl2MMqTs0XP4IPhOSikxuNf3x3WGOCdknQ2knvjMg/ODe1g1iexAodpKk3+UJVg8 CqJs8QJG/EAnf3Y8jnVS/aaacuAK2BXGGXSHl9r5d/ovFmeft7LzPauSxmTF7gK8mEW5Vb Bxxoj9ya1qMGgjuq5HNLD5OtbV2qLj+lYBNcy6+s+J5bAniVRJae+ep6/NPOjhnQMNwQ/1 fSCQUguO3wTen4o36hgCgQM4p60VW+VRoFtUQqwIJ4zHs6llN/9l+4GvuYuJyV/A61vXQ4 wZfI8MV8uuALDr2k1uGccksW5pPBKY7PR1HqlP1GSk3qOWaIRscP9iardd/6Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750793649; a=rsa-sha256; cv=none; b=DqPdd58EAqozF7BI4UPrHCOodM5JcHRvjFSQ1kR1YKfcLSupchq3+pr7tmJR/372Kqg581 2twEzO1nC0FII0uaTMKCjpDNJXtw+VW6Nhv1jLUX9fGrP69nxTiE5iIow/djbBS7828tdq p1lFnj+Z71W1JIF61x88nET6d2I/aKNGoKnqbQ912VdbqIJy3vJVqp2E/oTao3pcSIQqVL 9adyE9htE70ab3ZBNb3rbm6Ii0/FrqHIq2kxOfEybYFNOiPiWOeRAMaeVxLUlfyq5w4GO8 S/MLzpCkZJTk9SjJZUp4eFVBQ7+ahnV3szcbkz6Ef9we/2ZitZz4/qwNTTz3JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bRZrd2Smkz11qw; Tue, 24 Jun 2025 19:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55OJY9tE015142; Tue, 24 Jun 2025 19:34:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55OJY9lH015139; Tue, 24 Jun 2025 19:34:09 GMT (envelope-from git) Date: Tue, 24 Jun 2025 19:34:09 GMT Message-Id: <202506241934.55OJY9lH015139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1b0b13915aae - main - bsdinstall: Report error from installing firmware List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b0b13915aaea80007e4ff86f2bb4f622e10d780 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0b13915aaea80007e4ff86f2bb4f622e10d780 commit 1b0b13915aaea80007e4ff86f2bb4f622e10d780 Author: Ed Maste AuthorDate: 2025-06-19 16:00:30 +0000 Commit: Ed Maste CommitDate: 2025-06-24 19:13:39 +0000 bsdinstall: Report error from installing firmware We should improve error reporting from commands invoked by binstall more generally, but this is a small improvement for an observed failure case. PR: 287654 Reviewed by: allanjude Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50941 --- usr.sbin/bsdinstall/scripts/firmware | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/firmware b/usr.sbin/bsdinstall/scripts/firmware index a563f0e578e4..0fc66f0a0261 100644 --- a/usr.sbin/bsdinstall/scripts/firmware +++ b/usr.sbin/bsdinstall/scripts/firmware @@ -115,11 +115,23 @@ f_quietly cp -f $BSDINSTALL_TMPETC/resolv.conf $BSDINSTALL_CHROOT/etc/ ${DIALOG} --title "$DIALOG_TITLE" --backtitle "$DIALOG_BACKTITLE" \ --infobox "Installing firmware. This may take a moment." 0 0 +pkg_install_fail= # Install each of the selected firmware packages for fw in ${selected}; do # We install one at a time in case one is not avail. # pkg-install.8 needs an option to skip unavail. ASSUME_ALWAYS_YES=YES chroot $BSDINSTALL_CHROOT pkg install -qy ${fw} + if [ $? -ne 0 ]; then + pkg_install_fail="$pkg_install_fail $fw" + fi done +if [ -n "$pkg_install_fail" ]; then + # Error(s) were likely spammed to the console; give the user a moment + # to read them. + sleep 5 + bsddialog --backtitle "$OSNAME Installer" --title "Error" \ + --msgbox "Error fetching firmware file(s)$pkg_install_fail" 0 0 + exit 1 +fi # end