Author: gjb
Date: Tue Feb 3 00:07:54 2015
New Revision: 278118
URL: https://svnweb.freebsd.org/changeset/base/278118
Log:
Move service_enable="YES" rc.conf(5) additions to
VM_RC_LIST and deduplicate.
Evaluate if firstboot_freebsd_update should be enabled
based on UNAME_r, because it is not supported for the
-CURRENT or -STABLE branches.
MFC after: 2 weeks
X-MFC-with: r277458, r277536, r277606, r277609,
r277836
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/gce.conf
Modified: head/release/tools/gce.conf
==============================================================================
--- head/release/tools/gce.conf Mon Feb 2 23:41:43 2015 (r278117)
+++ head/release/tools/gce.conf Tue Feb 3 00:07:54 2015 (r278118)
@@ -9,7 +9,8 @@ export VM_EXTRA_PACKAGES="firstboot-free
google-startup-scripts"
# Set to a list of third-party software to enable in rc.conf(5).
-export VM_RC_LIST="google_accounts_manager ntpd"
+export VM_RC_LIST="google_accounts_manager ntpd sshd firstboot_growfs \
+ firstboot_pkgs google_startup"
vm_extra_install_base() {
echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf
@@ -22,17 +23,16 @@ vm_extra_pre_umount() {
dumpdev="AUTO"
ifconfig_vtnet0="SYNCDHCP mtu 1460"
ntpd_sync_on_start="YES"
-ntpd_enable="YES"
-sshd_enable="YES"
-google_accounts_manager_enable="YES"
-#disabled until I can figure out why the reboot for updates is hanging
-#firstboot_freebsd_update_enable="YES"
-#firstboot_pkgs_enable="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"
-firstboot_growfs_enable="YES"
-google_startup_enable="YES"
EOF
cat << EOF >> ${DESTDIR}/boot/loader.conf
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
