svn commit: r323570 - stable/11/usr.sbin/bsdinstall/scripts
Ed Maste
emaste at FreeBSD.org
Thu Sep 14 00:41:28 UTC 2017
Author: emaste
Date: Thu Sep 14 00:41:27 2017
New Revision: 323570
URL: https://svnweb.freebsd.org/changeset/base/323570
Log:
MFC r321226: bsdinstall: improve checksum mismatch error for snapshots
The usual case of a mismatched checksum for installer snapshots
(e.g., -CURRENT, -ALPHA*) is that a newer snapshot has been built and
the old install sets have been replaced. Provide a specific error
message for checksum mismatches there that suggests looking for a newer
snapshot.
Submitted by: Guangyuan Yang <yzgyyang at outlook.com>
Sponsored by: The FreeBSD Foundation
Modified:
stable/11/usr.sbin/bsdinstall/scripts/checksum
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/bsdinstall/scripts/checksum
==============================================================================
--- stable/11/usr.sbin/bsdinstall/scripts/checksum Thu Sep 14 00:39:08 2017 (r323569)
+++ stable/11/usr.sbin/bsdinstall/scripts/checksum Thu Sep 14 00:41:27 2017 (r323570)
@@ -62,8 +62,16 @@ for dist in $DISTRIBUTIONS; do
percentage=$(echo $percentage + 100/`echo $DISTRIBUTIONS | wc -w` | bc)
else
eval "status_$distname=1"
- dialog --backtitle "FreeBSD Installer" --title "Error" \
- --msgbox "The checksum for $dist does not match. It may have become corrupted, and should be redownloaded." 0 0
+ case $(/bin/freebsd-version -u) in
+ *-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE)
+ dialog --backtitle "FreeBSD 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
+ ;;
+ *)
+ dialog --backtitle "FreeBSD Installer" --title "Error" \
+ --msgbox "The checksum for $dist does not match. It may have become corrupted, and should be redownloaded." 0 0
+ ;;
+ esac
exit 1
fi
done
More information about the svn-src-stable
mailing list