svn commit: r259534 - in releng/10.0: release release/scripts usr.sbin/bsdconfig/share/packages

[Glen Barber]

Author: gjb
Date: Wed Dec 18 01:27:30 2013
New Revision: 259534
URL: http://svnweb.freebsd.org/changeset/base/259534

Log:
  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

Added:
  releng/10.0/release/scripts/FreeBSD_install_cdrom.conf
     - copied unchanged from r259533, stable/10/release/scripts/FreeBSD_install_cdrom.conf
Modified:
  releng/10.0/release/Makefile
  releng/10.0/usr.sbin/bsdconfig/share/packages/index.subr
Directory Properties:
  releng/10.0/   (props changed)

Modified: releng/10.0/release/Makefile
==============================================================================
--- releng/10.0/release/Makefile	Wed Dec 18 01:14:25 2013	(r259533)
+++ releng/10.0/release/Makefile	Wed Dec 18 01:27:30 2013	(r259534)
@@ -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

Copied: releng/10.0/release/scripts/FreeBSD_install_cdrom.conf (from r259533, stable/10/release/scripts/FreeBSD_install_cdrom.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ releng/10.0/release/scripts/FreeBSD_install_cdrom.conf	Wed Dec 18 01:27:30 2013	(r259534, copy of r259533, stable/10/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
+}
+

Modified: releng/10.0/usr.sbin/bsdconfig/share/packages/index.subr
==============================================================================
--- releng/10.0/usr.sbin/bsdconfig/share/packages/index.subr	Wed Dec 18 01:14:25 2013	(r259533)
+++ releng/10.0/usr.sbin/bsdconfig/share/packages/index.subr	Wed Dec 18 01:27:30 2013	(r259534)
@@ -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