svn commit: r337556 - head/release/tools

[Glen Barber]

Author: gjb
Date: Thu Aug  9 23:43:10 2018
New Revision: 337556
URL: https://svnweb.freebsd.org/changeset/base/337556

Log:
  Invoke the growfs rc script for each boot on GCE.
  
  PR:		230275
  Submitted by:	gustavo.scalet at collabora.com
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/gce.conf

Modified: head/release/tools/gce.conf
==============================================================================
--- head/release/tools/gce.conf	Thu Aug  9 23:31:18 2018	(r337555)
+++ head/release/tools/gce.conf	Thu Aug  9 23:43:10 2018	(r337556)
@@ -5,11 +5,10 @@
 
 # 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_network_daemon"
@@ -21,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"