From owner-svn-src-head@FreeBSD.ORG  Thu May 22 19:25:42 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 23C837C6;
 Thu, 22 May 2014 19:25:42 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 113EC22A3;
 Thu, 22 May 2014 19:25:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4MJPffS026284;
 Thu, 22 May 2014 19:25:41 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4MJPfpq026283;
 Thu, 22 May 2014 19:25:41 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201405221925.s4MJPfpq026283@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 22 May 2014 19:25:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266554 - 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.18
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: Thu, 22 May 2014 19:25:42 -0000

Author: gjb
Date: Thu May 22 19:25:41 2014
New Revision: 266554
URL: http://svnweb.freebsd.org/changeset/base/266554

Log:
  Disable the main FreeBSD pkg(7) repositories in the dvd
  repository configuration to avoid fetching from upstream
  in case there may be conflicts.
  
  MFC After:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/scripts/FreeBSD_install_cdrom.conf

Modified: head/release/scripts/FreeBSD_install_cdrom.conf
==============================================================================
--- head/release/scripts/FreeBSD_install_cdrom.conf	Thu May 22 19:22:03 2014	(r266553)
+++ head/release/scripts/FreeBSD_install_cdrom.conf	Thu May 22 19:25:41 2014	(r266554)
@@ -10,3 +10,7 @@ FreeBSD_install_cdrom: {
   enabled: yes
 }
 
+FreeBSD: {
+  enabled: no
+}
+