From nobody Wed Sep 14 17:06:36 2022 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 4MSRZN6Nzwz4cbW5; Wed, 14 Sep 2022 17:06:36 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MSRZN5sqPz3PtY; Wed, 14 Sep 2022 17:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663175196; 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=q/N3OoDvbHVN75kXToR65Su7IF1+NSxhZIhSYty89Fw=; b=YHHi/a4oOSAHvvOw4HtdqyaF2D4D9apgumABAhpqVtfXL4Rc84bX11qSAjdfhzvhVQ0b3x HqcCRQYEAgV5KhxI0N2RAccb+8IAdJBem1YLBTvBcmW+FEGEAtIkfQqhNpupKqFnX47T28 t8QH1RWH9Ntk9j8XrApu0i1em19Kbvx50kBdKQ/VO1l2mSHx4vRPTmZNG5g2LHVx3F6xAG WtJvADfOEGA0wOY4wmwc9KxFA7q7Y6IV1onYeQ4AtmcqJhKnJ65GgvGwnyjTY7VfywjCRu tSVuxE+baaXHgMAsXgdTzsKt+SOIwd02xXbCn9hisXNSx9nueKso06QCaTFeSw== 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 4MSRZN4v69zkrv; Wed, 14 Sep 2022 17:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28EH6am7098260; Wed, 14 Sep 2022 17:06:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28EH6abQ098259; Wed, 14 Sep 2022 17:06:36 GMT (envelope-from git) Date: Wed, 14 Sep 2022 17:06:36 GMT Message-Id: <202209141706.28EH6abQ098259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brad Davis Subject: git: 2913e785f057 - main - bsdinstall: fix a couple stragglers in whitelabeling the scripts 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2913e785f057f54f7ee825fe4f9fe3c039c0f78f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663175196; 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=q/N3OoDvbHVN75kXToR65Su7IF1+NSxhZIhSYty89Fw=; b=DkwceDT/IcUIFXgMZSBqUFOd171FjsJoPIzel2xEW60jQ/0/Jr/+vTs+hmia8Om2XtxKSf 6RheMUYDADD56rcfCoLp4HkDUfQnbuOQjof9t+2nn2m3FruwSRdMO5/VA04ZvpqjePhLgK Zf8cIo3l76pc7mM9tWQVTym1B4sIlGDFL/eD7dbvjqnAmhn/ZiG64GNm1gM8XCFJlnJDRD uZpGMItbkubpBonKzgg/TEsWlvHaGTo0+MHVBLxJRW1/8+Tb5McIarLHXyBJ8JlLIfs7XG 0os7eri1a46us+yrR12dE1rpWifGZqvvgknizw6nKESfWJt/H24PAC6bMfCnSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663175196; a=rsa-sha256; cv=none; b=GyM9gx3OPa++lK+ZmL/KEMI4wAaG8HlC5aZ8P1C3y8VAOfXbRIfoNyEYoPdVPTD1Sa/aZa UpQVfvE/+VTlt1fQn0cR22ZV0WvXqC0XnZtZaJP7rhvPHPrlwk4b++9GaZN5XeGx0NN4DT qTXCxii2pSFVa6ZVej8ZcQtLLyMzgcwaDqnS59lBLFs7L/UvsItxkCtZv8njhLs0XS3ZZy 02Rgp9AEueXmHDCHBz8NzgAB5k+qrAfhfnmEU5LN0+OO7fMotGcZnT3IDo3qyXxVzty30g 1o3Ph+nMPvpiDxnWFE+JlD52pf6tIHEbSSFJV407KLkZbzY9lCM4DWbfRHcHDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=2913e785f057f54f7ee825fe4f9fe3c039c0f78f commit 2913e785f057f54f7ee825fe4f9fe3c039c0f78f Author: Brad Davis AuthorDate: 2022-09-14 17:04:07 +0000 Commit: Brad Davis CommitDate: 2022-09-14 17:06:11 +0000 bsdinstall: fix a couple stragglers in whitelabeling the scripts PR: 265797 Reviewed by: allanjude, asiciliano Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D36235 --- usr.sbin/bsdinstall/scripts/checksum | 2 +- usr.sbin/bsdinstall/scripts/fetchmissingdists | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/checksum b/usr.sbin/bsdinstall/scripts/checksum index 003ef608254d..c9d7fc451f4b 100755 --- a/usr.sbin/bsdinstall/scripts/checksum +++ b/usr.sbin/bsdinstall/scripts/checksum @@ -68,7 +68,7 @@ for dist in $DISTRIBUTIONS; do case $(/bin/freebsd-version -u) in *-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE) bsddialog --backtitle "$OSNAME Installer" --title "Error" \ - --msgbox "The checksum for $dist does not match. It may have become corrupted, or it may be from a newer version of FreeBSD. Please check for a newer snapshot." 0 0 + --msgbox "The checksum for $dist does not match. It may have become corrupted, or it may be from a newer version of $OSNAME. Please check for a newer snapshot." 0 0 ;; *) bsddialog --backtitle "$OSNAME Installer" --title "Error" \ diff --git a/usr.sbin/bsdinstall/scripts/fetchmissingdists b/usr.sbin/bsdinstall/scripts/fetchmissingdists index a553eacd00c9..586058272e71 100644 --- a/usr.sbin/bsdinstall/scripts/fetchmissingdists +++ b/usr.sbin/bsdinstall/scripts/fetchmissingdists @@ -28,9 +28,12 @@ # $FreeBSD$ # +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 + error() { - bsddialog --backtitle "FreeBSD Installer" --title "Error" --msgbox "$1" 0 0 + bsddialog --backtitle "$OSNAME Installer" --title "Error" --msgbox "$1" 0 0 exit 1 }