From owner-svn-src-all@FreeBSD.ORG  Tue Mar 31 01:44:30 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D341C3DC;
 Tue, 31 Mar 2015 01:44:30 +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 BE687AB5;
 Tue, 31 Mar 2015 01:44:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2V1iUtS056817;
 Tue, 31 Mar 2015 01:44:30 GMT (envelope-from cperciva@FreeBSD.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2V1iU9e056816;
 Tue, 31 Mar 2015 01:44:30 GMT (envelope-from cperciva@FreeBSD.org)
Message-Id: <201503310144.t2V1iU9e056816@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: cperciva set sender to
 cperciva@FreeBSD.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 31 Mar 2015 01:44:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280881 - head/release/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2015 01:44:30 -0000

Author: cperciva
Date: Tue Mar 31 01:44:29 2015
New Revision: 280881
URL: https://svnweb.freebsd.org/changeset/base/280881

Log:
  Partially revert r278118 now that the required logic for deciding whether
  freebsd-update can be useful has moved into the firstboot_freebsd_update
  script.

Modified:
  head/release/tools/gce.conf

Modified: head/release/tools/gce.conf
==============================================================================
--- head/release/tools/gce.conf	Tue Mar 31 01:44:07 2015	(r280880)
+++ head/release/tools/gce.conf	Tue Mar 31 01:44:29 2015	(r280881)
@@ -10,7 +10,7 @@ export VM_EXTRA_PACKAGES="firstboot-free
 
 # Set to a list of third-party software to enable in rc.conf(5).
 export VM_RC_LIST="google_accounts_manager ntpd sshd firstboot_growfs \
-	firstboot_pkgs google_startup"
+	firstboot_pkgs firstboot_freebsd_update google_startup"
 
 vm_extra_install_base() {
 	echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf
@@ -23,13 +23,6 @@ vm_extra_pre_umount() {
 dumpdev="AUTO"
 ifconfig_DEFAULT="SYNCDHCP mtu 1460"
 ntpd_sync_on_start="YES"
-case \$(uname -r) in
-	*-BETA*|*-RC*|*-RELEASE*)
-		firstboot_freebsd_update_enable="YES"
-		;;
-	*)
-		;;
-esac
 # need to fill in something here
 #firstboot_pkgs_list=""
 panicmail_autosubmit="YES"