Author: emaste
Date: Wed Jul 19 18:25:52 2017
New Revision: 321226
URL: https://svnweb.freebsd.org/changeset/base/321226

Log:
  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 <yzgyy...@outlook.com>
  Sponsored by: The FreeBSD Foundation
  Differential Revision:        https://reviews.freebsd.org/D11641

Modified:
  head/usr.sbin/bsdinstall/scripts/checksum

Modified: head/usr.sbin/bsdinstall/scripts/checksum
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/checksum   Wed Jul 19 18:23:49 2017        
(r321225)
+++ head/usr.sbin/bsdinstall/scripts/checksum   Wed Jul 19 18:25:52 2017        
(r321226)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to