diff options
| author | gjb <gjb@FreeBSD.org> | 2014-11-21 02:30:37 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-11-21 02:30:37 +0000 |
| commit | 5074f8a73ef15d33d0e142de9376bc34ec07dbdf (patch) | |
| tree | 095848fbc0b45e0fd18c4ed38d78e4dae959d827 /release/tools/azure.conf | |
| parent | 8b1726e8cc096e375dec775efc8fec7ce1e3dc84 (diff) | |
| download | FreeBSD-src-5074f8a73ef15d33d0e142de9376bc34ec07dbdf.zip FreeBSD-src-5074f8a73ef15d33d0e142de9376bc34ec07dbdf.tar.gz | |
Revert r274773, after I *specifically* objected to this change
numerous times.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/tools/azure.conf')
| -rw-r--r-- | release/tools/azure.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 46b678c..3e4a486 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 } |
