svn commit: r259427 - head/usr.sbin/bsdconfig/share/packages

[Glen Barber]

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