From owner-svn-src-head@FreeBSD.ORG  Sun Dec 15 20:38:08 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 5474D75D;
 Sun, 15 Dec 2013 20:38:08 +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 40EBD1041;
 Sun, 15 Dec 2013 20:38:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFKc80e076472;
 Sun, 15 Dec 2013 20:38:08 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFKc7vS076470;
 Sun, 15 Dec 2013 20:38:07 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312152038.rBFKc7vS076470@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 15 Dec 2013 20:38:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259426 - in head/release: . scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Dec 2013 20:38:08 -0000

Author: gjb
Date: Sun Dec 15 20:38:07 2013
New Revision: 259426
URL: http://svnweb.freebsd.org/changeset/base/259426

Log:
  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.
  
  MFC after:	3 days
  X-MFC-Before:	-RC3
  Sponsored by:	The FreeBSD Foundation

Added:
  head/release/scripts/FreeBSD_install_cdrom.conf   (contents, props changed)
Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Sun Dec 15 19:18:18 2013	(r259425)
+++ head/release/Makefile	Sun Dec 15 20:38:07 2013	(r259426)
@@ -225,7 +225,11 @@ pkg-stage:
 .if !defined(NOPKG) && 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

Added: head/release/scripts/FreeBSD_install_cdrom.conf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/release/scripts/FreeBSD_install_cdrom.conf	Sun Dec 15 20:38:07 2013	(r259426)
@@ -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
+}
+