From owner-svn-src-all@freebsd.org Thu Aug 16 15:17:23 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CEC3106A5A2;
Thu, 16 Aug 2018 15:17:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 231368707C;
Thu, 16 Aug 2018 15:17:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 044A31B240;
Thu, 16 Aug 2018 15:17:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7GFHMAf039893;
Thu, 16 Aug 2018 15:17:22 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7GFHMhv039892;
Thu, 16 Aug 2018 15:17:22 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201808161517.w7GFHMhv039892@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 16 Aug 2018 15:17:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r337908 - in stable: 10/release/tools 11/release/tools
X-SVN-Group: stable-11
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in stable: 10/release/tools 11/release/tools
X-SVN-Commit-Revision: 337908
X-SVN-Commit-Repository: base
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.27
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Aug 2018 15:17:23 -0000
Author: gjb
Date: Thu Aug 16 15:17:22 2018
New Revision: 337908
URL: https://svnweb.freebsd.org/changeset/base/337908
Log:
MFC r337717, r337718:
r337717:
Add lang/python2, lang/python3, and lang/python to GCE images
to help avoid hard-coding 'python<MAJOR>.<MINOR>' in several
scripts in the client-side scripts. [1]
r337718:
Add a space between a variable and escaped new line.
PR: 230248 [1]
Sponsored by: The FreeBSD Foundation
Modified:
stable/11/release/tools/gce.conf
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/release/tools/gce.conf
Directory Properties:
stable/10/ (props changed)
Modified: stable/11/release/tools/gce.conf
==============================================================================
--- stable/11/release/tools/gce.conf Thu Aug 16 14:46:49 2018 (r337907)
+++ stable/11/release/tools/gce.conf Thu Aug 16 15:17:22 2018 (r337908)
@@ -5,10 +5,11 @@
# Set to a list of packages to install.
export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
- google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine"
+ google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \
+ lang/python lang/python2 lang/python3"
# Set to a list of third-party software to enable in rc.conf(5).
-export VM_RC_LIST="ntpd sshd growfs\
+export VM_RC_LIST="ntpd sshd growfs \
firstboot_pkgs firstboot_freebsd_update google_startup \
google_accounts_daemon google_clock_skew_daemon \
google_instance_setup google_network_daemon"