diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2019-05-31 18:40:19 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2019-05-31 18:40:19 +0000 |
| commit | 899e81f9f8016522c9c58795e0f606ca5bc4bf08 (patch) | |
| tree | 353a45250f01d4782b2c352b1fd02507002f49b2 /release | |
| parent | 8726929d67052e89f7849bdb4445f859e98038c8 (diff) | |
Notes
Diffstat (limited to 'release')
| -rw-r--r-- | release/tools/gce.conf | 6 | ||||
| -rw-r--r-- | release/tools/vmimage.subr | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 951b615e7e26..f156a5bb93eb 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -6,14 +6,10 @@ # The default of 3GB is too small for GCE, so override the size here. export VMSIZE=20G -# The sysutils/py-google-compute-engine port needs the lang/python -# symbolic link to point to lang/python2. -export DEFAULT_VERSIONS="python=2.7" - # 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 \ - lang/python lang/python2" + 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 \ diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index bcf9a285a293..6e29139402be 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -72,10 +72,6 @@ cleanup() { mdconfig -d -u ${mddev} fi - # Avoid inheriting the DEFAULT_VERSIONS for lang/python from - # the gce.conf. - unset DEFAULT_VERSIONS - return 0 } |
