aboutsummaryrefslogtreecommitdiff
path: root/release/tools/azure.conf
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-11-21 02:30:37 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-11-21 02:30:37 +0000
commit30a20c89bf905f464bf62a3904e74802fb86b80d (patch)
tree095848fbc0b45e0fd18c4ed38d78e4dae959d827 /release/tools/azure.conf
parent32dbc829820b1b03bf2e27d204cb3fee8d072da9 (diff)
downloadsrc-30a20c89bf905f464bf62a3904e74802fb86b80d.tar.gz
src-30a20c89bf905f464bf62a3904e74802fb86b80d.zip
Revert r274773, after I *specifically* objected to this change
numerous times. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-vmimage/; revision=274775
Diffstat (limited to 'release/tools/azure.conf')
-rw-r--r--release/tools/azure.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 46b678cd5c25..3e4a4864adfe 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -5,7 +5,7 @@
# Set to a list of packages to install.
# Example:
-#export VM_EXTRA_PACKAGES="www/apache24 ports-mgmt/pkg"
+#export VM_EXTRA_PACKAGES="www/apache24"
export VM_EXTRA_PACKAGES=
# Set to a list of third-party software to enable in rc.conf(5).
@@ -17,6 +17,7 @@ vm_extra_install_base() {
fetch -o ${DESTDIR}/usr/sbin/waagent \
http://people.freebsd.org/~gjb/waagent
chmod +x ${DESTDIR}/usr/sbin/waagent
+ rm -f ${DESTDIR}/etc/resolv.conf
return 0
}
@@ -32,6 +33,8 @@ vm_extra_pre_umount() {
echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf
echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf
+ rm -f ${DESTDIR}/etc/resolv.conf
+
return 0
}