diff options
| author | cperciva <cperciva@FreeBSD.org> | 2015-03-31 01:44:29 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2015-03-31 01:44:29 +0000 |
| commit | 2d3f9a1b0ba8b1a9856d090669d56fb9be167ad6 (patch) | |
| tree | a059443053c6dc70c6c5ee704da86746c356b85f | |
| parent | 82927bc93023c74bea351747a06fabe2bd35e6e5 (diff) | |
| download | FreeBSD-src-2d3f9a1b0ba8b1a9856d090669d56fb9be167ad6.zip FreeBSD-src-2d3f9a1b0ba8b1a9856d090669d56fb9be167ad6.tar.gz | |
Partially revert r278118 now that the required logic for deciding whether
freebsd-update can be useful has moved into the firstboot_freebsd_update
script.
| -rw-r--r-- | release/tools/gce.conf | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/release/tools/gce.conf b/release/tools/gce.conf index c8af650..082ac0d 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -10,7 +10,7 @@ export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="google_accounts_manager ntpd sshd firstboot_growfs \ - firstboot_pkgs google_startup" + firstboot_pkgs firstboot_freebsd_update google_startup" vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf @@ -23,13 +23,6 @@ vm_extra_pre_umount() { dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" -case \$(uname -r) in - *-BETA*|*-RC*|*-RELEASE*) - firstboot_freebsd_update_enable="YES" - ;; - *) - ;; -esac # need to fill in something here #firstboot_pkgs_list="" panicmail_autosubmit="YES" |
