diff options
author | gjb <gjb@FreeBSD.org> | 2014-10-14 15:22:46 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2014-10-14 15:22:46 +0000 |
commit | 8c82c92eec8288836ace370b7f007da16f4a2c23 (patch) | |
tree | acfa7870dec8e734f823d6db57d1b0799de03ad1 /release/tools | |
parent | 594c54630f7d35d5f8feece66ae5ef818703cd18 (diff) | |
parent | d7ed1332f2785ea5f9d8f7924b2654aaf1dd486d (diff) | |
download | FreeBSD-src-8c82c92eec8288836ace370b7f007da16f4a2c23.zip FreeBSD-src-8c82c92eec8288836ace370b7f007da16f4a2c23.tar.gz |
Merge the following from ^/projects/release-vmimage:
r273076, r273077, r273079, r273095:
r273076:
Add a separate make(1) target to release/Makefile to
build FreeBSD virtual machine disk images for use on
the Microsoft Azure service.
For now, this target is not directly connected to the
build, however can be manually invoked.
The 'vm-azure' target invokes {amd64,i386}/mk-azure.sh,
which does the heavy lifting to produce proper VHDs.
mk-azure.sh uses a configuration file, defaulting to
tools/azure.conf if otherwise unset.
r273077:
Clear VM_RC_LIST.
r273079:
Fix signal list to trigger umount(8).
r273095:
Output an informational message when mkimg(1) runs, so it
does not appear that the process has stopped while waiting
for a 'y/n' response when waagent is deprovisioned.
Tested on: releng/10.1@r272876
MFC after: 3 days
X-MFC-10.1: yes
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/tools')
-rw-r--r-- | release/tools/azure.conf | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/release/tools/azure.conf b/release/tools/azure.conf new file mode 100644 index 0000000..8f16acc --- /dev/null +++ b/release/tools/azure.conf @@ -0,0 +1,14 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Set to a list of packages to install. +# Example: +#export VM_EXTRA_PACKAGES="www/apache24" +export VM_EXTRA_PACKAGES= + +# Set to a list of third-party software to enable in rc.conf(5). +# Example: +#export VM_RC_LIST="apache24" +export VM_RC_LIST= |