Partially revert r278118 now that the required logic for deciding whether
freebsd-update can be useful has moved into the firstboot_freebsd_update script.
This commit is contained in:
parent
333d295946
commit
6e8e6c9951
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user