svn commit: r337908 - in stable: 10/release/tools 11/release/tools

[Glen Barber]

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/10/release/tools/gce.conf
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/release/tools/gce.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/release/tools/gce.conf
==============================================================================
--- stable/10/release/tools/gce.conf	Thu Aug 16 14:46:49 2018	(r337907)
+++ stable/10/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"