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

[Glen Barber]

Author: gjb
Date: Mon Aug 13 14:24:00 2018
New Revision: 337710
URL: https://svnweb.freebsd.org/changeset/base/337710

Log:
  MFC r337555, r337556:
   r337555:
    Update and replace old rc daemons for GCE images.
  
   r337556:
    Invoke the growfs rc script for each boot on GCE.
  
  PR:		229000, 230275
  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	Mon Aug 13 14:13:25 2018	(r337709)
+++ stable/11/release/tools/gce.conf	Mon Aug 13 14:24:00 2018	(r337710)
@@ -5,15 +5,13 @@
 
 # Set to a list of packages to install.
 export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
-	google-cloud-sdk panicmail sudo firstboot-growfs \
-	sysutils/py-google-compute-engine"
+	google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine"
 
 # Set to a list of third-party software to enable in rc.conf(5).
-export VM_RC_LIST="ntpd sshd firstboot_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_ip_forwarding_daemon \
-	google_network_setup"
+	google_instance_setup google_network_daemon"
 
 vm_extra_install_base() {
 	echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf
@@ -22,6 +20,10 @@ vm_extra_install_base() {
 }
 
 vm_extra_pre_umount() {
+	# Enable growfs on every boot, not only the first, as as instance's disk can
+	# be enlarged post-creation
+	sed -i -e '/KEYWORD: firstboot/d' /etc/rc.d/growfs
+
 	cat << EOF >> ${DESTDIR}/etc/rc.conf
 dumpdev="AUTO"
 ifconfig_DEFAULT="SYNCDHCP mtu 1460"