svn commit: r277264 - projects/release-vmimage/release/tools
Glen Barber
gjb at FreeBSD.org
Fri Jan 16 19:38:25 UTC 2015
Author: gjb
Date: Fri Jan 16 19:38:24 2015
New Revision: 277264
URL: https://svnweb.freebsd.org/changeset/base/277264
Log:
Style and line length cleanup.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-vmimage/release/tools/gce.conf
Modified: projects/release-vmimage/release/tools/gce.conf
==============================================================================
--- projects/release-vmimage/release/tools/gce.conf Fri Jan 16 19:27:19 2015 (r277263)
+++ projects/release-vmimage/release/tools/gce.conf Fri Jan 16 19:38:24 2015 (r277264)
@@ -4,7 +4,9 @@
#
# Set to a list of packages to install.
-export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs google-cloud-sdk google-daemon panicmail sudo firstboot-growfs google-startup-scripts"
+export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
+ google-cloud-sdk google-daemon panicmail sudo firstboot-growfs \
+ 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"
@@ -16,7 +18,7 @@ vm_extra_install_base() {
}
vm_extra_pre_umount() {
- cat << EOF >> ${DESTDIR}/etc/rc.conf
+ cat << EOF >> ${DESTDIR}/etc/rc.conf
console="comconsole"
dumpdev="AUTO"
ifconfig_vtnet0="SYNCDHCP mtu 1460"
@@ -34,7 +36,7 @@ firstboot_growfs_enable="YES"
google_startup_enable="YES"
EOF
- cat << EOF >> ${DESTDIR}/boot/loader.conf
+ cat << EOF >> ${DESTDIR}/boot/loader.conf
autoboot_delay="-1"
beastie_disable="YES"
loader_logo="none"
@@ -50,7 +52,7 @@ EOF
${DESTDIR}/etc/hosts
# overwrite ntp.conf
- cat << EOF > ${DESTDIR}/etc/ntp.conf
+ cat << EOF > ${DESTDIR}/etc/ntp.conf
server metadata.google.internal iburst
restrict default kod nomodify notrap nopeer noquery
@@ -61,11 +63,11 @@ restrict -6 ::1
restrict 127.127.1.0
EOF
- cat << EOF >> ${DESTDIR}/etc/syslog.conf
+ cat << EOF >> ${DESTDIR}/etc/syslog.conf
*.err;kern.warning;auth.notice;mail.crit /dev/console
EOF
- cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config
+ cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config
ChallengeResponseAuthentication no
X11Forwarding no
AcceptEnv LANG
@@ -74,11 +76,11 @@ AllowAgentForwarding no
ClientAliveInterval 420
EOF
- cat << EOF >> ${DESTDIR}/etc/crontab
+ cat << EOF >> ${DESTDIR}/etc/crontab
0 3 * * * root /usr/sbin/freebsd-update cron
EOF
- cat << EOF >> ${DESTDIR}/etc/sysctl.conf
+ cat << EOF >> ${DESTDIR}/etc/sysctl.conf
net.inet.icmp.drop_redirect=1
net.inet.ip.redirect=0
net.inet.tcp.blackhole=2
@@ -88,9 +90,9 @@ debug.trace_on_panic=1
debug.debugger_on_panic=0
EOF
- sed -E -i '' 's/^([^#].*[[:space:]])on/\1off/' ${DESTDIR}/etc/ttys
+ sed -E -i '' 's/^([^#].*[[:space:]])on/\1off/' ${DESTDIR}/etc/ttys
- touch ${DESTDIR}/firstboot
+ touch ${DESTDIR}/firstboot
return 0
}
More information about the svn-src-projects
mailing list