git: 2913e785f057 - main - bsdinstall: fix a couple stragglers in whitelabeling the scripts
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 14 Sep 2022 17:06:36 UTC
The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=2913e785f057f54f7ee825fe4f9fe3c039c0f78f commit 2913e785f057f54f7ee825fe4f9fe3c039c0f78f Author: Brad Davis <brd@FreeBSD.org> AuthorDate: 2022-09-14 17:04:07 +0000 Commit: Brad Davis <brd@FreeBSD.org> 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 }