diff options
| author | cperciva <cperciva@FreeBSD.org> | 2014-11-21 01:53:40 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2014-11-21 01:53:40 +0000 |
| commit | cb036cbe50cf25bdcc6642eb5f0810af8e4d58db (patch) | |
| tree | 095848fbc0b45e0fd18c4ed38d78e4dae959d827 /release | |
| parent | 38536134a537e0bdb40e60d84c17bb691424480d (diff) | |
| download | FreeBSD-src-cb036cbe50cf25bdcc6642eb5f0810af8e4d58db.zip FreeBSD-src-cb036cbe50cf25bdcc6642eb5f0810af8e4d58db.tar.gz | |
Add NOSWAP option which can be set by a vmimage.conf file to specify that
no swap space should be created in the image. This will be used by EC2
builds, since FreeBSD/EC2 allocates swap space on "ephemeral" disks which
are physically attached to the Xen host node.
Diffstat (limited to 'release')
| -rw-r--r-- | release/tools/vmimage.subr | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3e1ddce..c780572 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -10,19 +10,22 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin" trap "cleanup" INT QUIT TRAP ABRT TERM write_partition_layout() { + if [ -z "${NOSWAP}" ]; then + SWAPOPT="-p freebsd-swap/swapfs::1G" + fi case "${TARGET}:${TARGET_ARCH}" in amd64:amd64 | i386:i386) mkimg -s gpt -b /boot/pmbr \ -p freebsd-boot/bootfs:=/boot/gptboot \ - -p freebsd-swap/swapfs::1G \ + ${SWAPOPT} \ -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; powerpc:powerpc*) mkimg -s apm \ -p apple-boot/bootfs:=/boot/boot1.hfs \ - -p freebsd-swap/swapfs::1G \ + ${SWAPOPT} \ -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; @@ -76,8 +79,10 @@ vm_install_base() { > ${DESTDIR}/etc/fstab echo '/dev/gpt/rootfs / ufs rw 1 1' \ >> ${DESTDIR}/etc/fstab - echo '/dev/gpt/swapfs none swap sw 0 0' \ - >> ${DESTDIR}/etc/fstab + if [ -z "${NOSWAP}" ]; then + echo '/dev/gpt/swapfs none swap sw 0 0' \ + >> ${DESTDIR}/etc/fstab + fi mkdir -p ${DESTDIR}/dev mount -t devfs devfs ${DESTDIR}/dev |
