From owner-svn-src-projects@FreeBSD.ORG Wed Apr 22 18:46:30 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC4A97F3; Wed, 22 Apr 2015 18:46:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BADCE1560; Wed, 22 Apr 2015 18:46:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3MIkU69025455; Wed, 22 Apr 2015 18:46:30 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3MIkUc4025453; Wed, 22 Apr 2015 18:46:30 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504221846.t3MIkUc4025453@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 22 Apr 2015 18:46:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281864 - projects/release-install-debug/usr.sbin/bsdinstall/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2015 18:46:30 -0000 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 \