svn commit: r278528 - projects/release-install-debug/usr.sbin/bsdinstall/scripts

[Glen Barber]

Author: gjb
Date: Tue Feb 10 19:04:58 2015
New Revision: 278528
URL: https://svnweb.freebsd.org/changeset/base/278528

Log:
  Include MANIFEST in LOCAL_DISTRIBUTIONS by default.
  
  It seems like a Really Bad Idea to fetch a remote checksum
  file when there is always one available locally.
  
  Any situation where a local MANIFEST is not available is
  a bug.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto

Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto	Tue Feb 10 18:53:35 2015	(r278527)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto	Tue Feb 10 19:04:58 2015	(r278528)
@@ -80,7 +80,7 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; 
 	done
 fi
 
-LOCAL_DISTRIBUTIONS=""
+LOCAL_DISTRIBUTIONS="MANIFEST"
 FETCH_DISTRIBUTIONS=""
 for dist in $DISTRIBUTIONS; do
 	if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then
@@ -172,7 +172,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
 		DISTDIR_IS_UNIONFS=1
 		mount_nullfs -o union "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR"
 	else
-		export DISTRIBUTIONS="MANIFEST $FETCH_DISTRIBUTIONS"
+		export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS"
 		export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST"
 	fi