aboutsummaryrefslogtreecommitdiff
path: root/release/tools
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2018-08-09 23:43:10 +0000
committerGlen Barber <gjb@FreeBSD.org>2018-08-09 23:43:10 +0000
commit6ac4304a0ff89105ff7c16722a47da5a0ff1b4ab (patch)
tree78f770df0e87d3f1ba92ebdc0868b2c57da92c0d /release/tools
parent0366e18e5a1b717e90a7434bdab3fa9986af8b63 (diff)
downloadsrc-6ac4304a0ff89105ff7c16722a47da5a0ff1b4ab.tar.gz
src-6ac4304a0ff89105ff7c16722a47da5a0ff1b4ab.zip
Invoke the growfs rc script for each boot on GCE.
PR: 230275 Submitted by: gustavo.scalet@collabora.com MFC after: 3 days Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=337556
Diffstat (limited to 'release/tools')
-rw-r--r--release/tools/gce.conf9
1 files changed, 6 insertions, 3 deletions
diff --git a/release/tools/gce.conf b/release/tools/gce.conf
index 749574e58736..29d1faf66bd9 100644
--- a/release/tools/gce.conf
+++ b/release/tools/gce.conf
@@ -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"