From a11b632239dc3043ba926bda5ac2ba2d24707201 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 18 Dec 2013 01:27:30 +0000
Subject: [PATCH] MFC r259426, r259427:

r259426:
  Add a pkg(8) repository configuration file for cdrom-based package
  installation.

  As part of the 'pkg-stage' target, copy the configuration file
  to the 'packages/repos/' directory on the DVD filesystem.

r259427:
  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.

Approved by:	re (delphij, glebius)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259534 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/Makefile                             |  4 ++++
 release/scripts/FreeBSD_install_cdrom.conf   | 12 ++++++++++++
 usr.sbin/bsdconfig/share/packages/index.subr |  3 +++
 3 files changed, 19 insertions(+)
 create mode 100644 release/scripts/FreeBSD_install_cdrom.conf

diff --git a/release/Makefile b/release/Makefile
index 65085f6c..83c3d1e8 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -217,7 +217,11 @@ pkg-stage:
 .if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
 	sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
 		${REVISION}
+	mkdir -p ${.OBJDIR}/dvd/packages/repos/
+	cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \
+		${.OBJDIR}/dvd/packages/repos/
 .endif
+	touch ${.TARGET}
 
 cdrom: disc1.iso bootonly.iso
 dvdrom: dvd1.iso
diff --git a/release/scripts/FreeBSD_install_cdrom.conf b/release/scripts/FreeBSD_install_cdrom.conf
new file mode 100644
index 00000000..44554b11
--- /dev/null
+++ b/release/scripts/FreeBSD_install_cdrom.conf
@@ -0,0 +1,12 @@
+#
+# $FreeBSD$
+#
+# The pkg(8) repository configuration file for the installation DVD.
+#
+
+FreeBSD_install_cdrom: {
+  url: "file:///dist/packages/${ABI}",
+  mirror_type: "none",
+  enabled: yes
+}
+
diff --git a/usr.sbin/bsdconfig/share/packages/index.subr b/usr.sbin/bsdconfig/share/packages/index.subr
index 6e14e4c6..535d815b 100755
--- a/usr.sbin/bsdconfig/share/packages/index.subr
+++ b/usr.sbin/bsdconfig/share/packages/index.subr
@@ -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
-- 
2.42.0