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

[Glen Barber]

Author: gjb
Date: Wed Apr 22 18:46:29 2015
New Revision: 281864
URL: https://svnweb.freebsd.org/changeset/base/281864

Log:
  Fix mapping the distribution package name in the MANIFEST to
  what is available on-disk to fix installing distribution sets
  that are available locally, but do not directly match what is
  shown on the distribution selection menu.
  
  Instead of doing any further string manipulation to create the
  menu, just use the distribution set name without the '.txz'
  suffix.
  
  At this point, the fourth column in the MANIFEST is likely not
  needed anymore, but it won't be removed yet until I am certain.
  
  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	Wed Apr 22 18:35:02 2015	(r281863)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto	Wed Apr 22 18:46:29 2015	(r281864)
@@ -66,8 +66,8 @@ bsdinstall hostname || error "Set hostna
 
 export DISTRIBUTIONS="base.txz kernel.txz"
 if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
-	DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $4,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
-	DISTMENU="$(echo ${DISTMENU} | tr '_' '-')"
+	DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
+	DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')"
 
 	exec 3>&1
 	EXTRA_DISTS=$( eval dialog \