d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially revert r278118 now that the required logic for deciding whether

Browse Source 
freebsd-update can be useful has moved into the firstboot_freebsd_update
script.
This commit is contained in:
cperciva 2015-03-31 01:44:29 +00:00
parent 82927bc930
commit 2d3f9a1b0b
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/tools/gce.conf
View File

@ -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). # 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 \ 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() { vm_extra_install_base() {
echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf
@ -23,13 +23,6 @@ vm_extra_pre_umount() {
dumpdev="AUTO" dumpdev="AUTO"
ifconfig_DEFAULT="SYNCDHCP mtu 1460" ifconfig_DEFAULT="SYNCDHCP mtu 1460"
ntpd_sync_on_start="YES" ntpd_sync_on_start="YES"
case \$(uname -r) in
*-BETA*|*-RC*|*-RELEASE*)
firstboot_freebsd_update_enable="YES"
;;
*)
;;
esac
# need to fill in something here # need to fill in something here
#firstboot_pkgs_list="" #firstboot_pkgs_list=""
panicmail_autosubmit="YES" panicmail_autosubmit="YES"