From owner-svn-src-all@FreeBSD.ORG  Sun Dec 15 20:47:27 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E98BDA42;
 Sun, 15 Dec 2013 20:47:27 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D4F3D10D4;
 Sun, 15 Dec 2013 20:47:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFKlRSE079899;
 Sun, 15 Dec 2013 20:47:27 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFKlRrJ079898;
 Sun, 15 Dec 2013 20:47:27 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312152047.rBFKlRrJ079898@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 15 Dec 2013 20:47:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259427 - head/usr.sbin/bsdconfig/share/packages
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Dec 2013 20:47:28 -0000

Author: gjb
Date: Sun Dec 15 20:47:27 2013
New Revision: 259427
URL: http://svnweb.freebsd.org/changeset/base/259427

Log:
  Export 'REPOS_DIR' when the selected source medium for package
  installation is cdrom.  This enables bsdconfig(8) to make use
  of the on-disc pkg(8) repository configuration, which fixes
  package selection and installation from the dvd installer.
  
  MFC after:	3 days
  M-MFC-With:	r259426
  X-MFC-Before:	-RC3
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.sbin/bsdconfig/share/packages/index.subr

Modified: head/usr.sbin/bsdconfig/share/packages/index.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/index.subr	Sun Dec 15 20:38:07 2013	(r259426)
+++ head/usr.sbin/bsdconfig/share/packages/index.subr	Sun Dec 15 20:47:27 2013	(r259427)
@@ -119,6 +119,9 @@ f_index_initialize()
 	$DEVICE_TYPE_HTTP_PROXY)
 		f_getvar $VAR_HTTP_PROXY_PATH __site
 		__site="$__site/packages/$PKG_ABI" ;;
+	$DEVICE_TYPE_CDROM)
+		__site="file://$MOUNTPOINT/packages/$PKG_ABI"
+		export REPOS_DIR="$MOUNTPOINT/packages/repos" ;;
 	*) # UFS, DISK, CDROM, USB, DOS, NFS, etc.
 		__site="file://$MOUNTPOINT/packages/$PKG_ABI"
 	esac