aboutsummaryrefslogtreecommitdiff
path: root/release/amd64
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-01-20 23:56:04 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-01-20 23:56:04 +0000
commit2d4ff62f0094f8635ffad8d72dbc2f89e234e8fd (patch)
tree278583afe25e9c56d48457731ae7b98282a5f9d4 /release/amd64
parent16e2dc663f63ec78bf4a2a6e8a2d648ba201c34f (diff)
parent5f87b8f5f9e0754c86ed3e2778eeff6c4656d6ea (diff)
downloadsrc-2d4ff62f0094f8635ffad8d72dbc2f89e234e8fd.tar.gz
src-2d4ff62f0094f8635ffad8d72dbc2f89e234e8fd.zip
Merge the following revisions from ^/projects/release-vmimage:
r273823-r273826, r273833, r273836, r273944, r274069-r274071, r274134, r274211, r274280-r274285, r274287-r274288, r274292, r274296-r274297, r274356, r274533, r274725, r274726, r274729, r274734, r274771, r274945-r274946, r277180, r277183-r277184, r277186-r277187, r277250-r277253, r277263-r277264, r277383-r277384, r277393-r277395, r277438-r277439, r277447, r277455: r273823: Move virtual machine / cloud provider targets and options from release/Makefile to their own Makefile. r273824: Add glue to allow enabling building cloud provider VM images by default. When WITH_CLOUDWARE is not empty, add CLOUDTARGETS to the release/Makefile 'release' target. r273825: Avoid hard-coding the Azure image file format. While here, avoid using OSRELEASE for the output file name. r273826: Remove a few vestiges of passing an exit code to panic(). r273833: Initial commit providing a mechanism to create openstack images as part of the release build. r273836: Fix output file name for openstack images. No further conversion is necessary for this VM file target, so there is no need to append the '.raw' suffix here. r273944: Uncomment the cloudinit rc.conf(5) line. r274069: Add line continuation so OPENSTACKCONF is actually included in the env(1). r274070: Add a 'vm-cloudware' target, used to drive all targets in CLOUDTARGETS. r274071: Add examples for WITH_CLOUDWARE to release.conf.sample. Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS. r274134: Initial rewrite to consolidate VM image build scripts into one. r274211: Add write_partition_layout() used to populate the final image. Fix duplicated mkimg(1) call in vm_create_disk(). Add primitive (untested) PowerPC/PowerPC64 VM image support. Note: As it is currently written, the /boot/pmbr and /boot/{gptboot,boot1.hfs} use the build host and not the target build. Fixing this is likely going to be a hack in itself. r274280: Return if vm_create_disk() is unsuccessful. r274281: Add CLEANFILES entry for VM targets r274282: Add vm_extra_pre_umount() prototype to vmimage.subr. r274283: Fix DESTDIR for installworld, and make sure it is created before use. r274284: Move usage() from vmimage.subr to mk-vmimage.sh, in case vmimage.subr has not been sourced. r274285: Spell 'OPTARG' correctly. Actually call vm_create_base(). r274287: Fix line continuation in write_partition_layout(). Remove variable test that is no longer needed. r274288: Fix scheme flag to mkimg(1). r274292: mount(8) and umount(8) devfs(5) as needed. r274296: Change path for mk-vmimage.sh from ${TARGET}/ to scripts/ now that it is consolidated into one file. Fix paths for the base image and output disk image files. r274297: Call cleanup() after everything is done. r274356: Remove a stray directory from CLEANFILES. r274533: Set the boot partition type to 'apple-boot' for powerpc. r274725: In vm_install_base(), copy the host resolv.conf into the build chroot before attempting to do anything that requires working DNS (i.e., pkg bootstrap). In vm_extra_pre_umount(), remove the resolv.conf before the disk image is unmounted from the backing md(4). r274726 (cperciva): Silence errors when umounting the chroot's /dev, since it probably doesn't exist when we're running this. Unmount filesystems before attempting to destroy the md which holds them. r274729 (cperciva): Unmount filesystem and destroy md before we read the vnode from disk and package it into a disk image. Otherwise we end up packaging an unclean filesystem. r274734 (cperciva): Merge duplicative vm-CLOUDTYPE targets before additional duplication gets added by the impending arrival of ec2 and gcloud. r274771 (cperciva): 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. r274945: In vm_extra_install_packages(), only bootstrap pkg(8) if VM_EXTRA_PACKAGES is empty. In vm_extra_pre_umount(), cleanup downloaded packages if pkg(8) was bootstrapped earlier. r274946: Fix indentation nit. r277180: In vm_extra_install_base(), do not install waagent in the openstack image, because it is not used. This appears to be a copy mistake. Remove vm_extra_install_base() from the openstack.conf entirely, since it does not need to be overridden. r277183: Enable the textmode console by default for VM images, since there is no way to tell if the environment will be able to use the graphics-mode console. r277184: Enable password-less sudo for openstack images. r277186: Update the VM_EXTRA_PACKAGES list for the openstack images. The documentation suggests doing a "just fetch this and run it"-style bootstrap, from which the list of dependencies was obtained (in github, at: pellaeon/bsd-cloudinit-installer) There is one Python dependency unmet, oslo.config, which is not in the Ports Collection. r277187: Add a comment to note that setting hw.vga.textmode=1 is temporary. r277250: Remove vm_extra_install_base() for the Azure image, now that the waagent exists in the ports tree. Add sysutils/azure-agent to the VM_EXTRA_PACKAGES list. In vm_extra_pre_umount(), remove the explicit pkg(8) install list, as dependencies are resolved by sysutils/azure-agent. r277251: Add a 'list-cloudware' target to print the list of supported CLOUDWARE values and a description. Add the AZURE_DESC and OPENSTACK_DESC descriptions. r277252: Update release(7) r277253: Add 'list-vmtargets' target, which produces a list of all supported VM and cloud provider images. Add VHD_DESC, VMDK_DESC, QCOW2_DESC, RAW_DESC image descriptions. Format the output to make a bit more readable. Update release(7) to document the list-vmtargets target. r277263: Add initial support for the GCE (Google Compute Engine) cloud hosting provider image. r277264: Style and line length cleanup. r277383: Remove the console setting from rc.conf(5), which is not used there. While here, set console to include vidconsole in the loader.conf(5). r277384: Fix an indentation nit. No functional changes. r277393: Remove the pkg-clean(8) call from vm_extra_pre_umount() since the function is often overridden. Add vm_extra_pkg_rmcache() to call pkg-clean(8) to avoid duplicated code. r277394: Move resolv.conf(5) removal back to vm_extra_pre_umount() where it belongs. The GCE image needs resolv.conf(5) to exist (created as part of the image setup), so it cannot be removed. r277395: Comment the line that configures ttys(5) to 'off', which makes it impossible to test that the image boots. Add a note explaining why the line is commented, and not (yet) removed entirely. r277438: Move the 'install' bits that are specific to virtual machine images from the Makefile to Makefile.vm. Rename the 'install' target to 'release-install', and add a new 'vm-install' target. Add a new 'install' target that invokes the new targets. r277439: Add WITH_CLOUDWARE to the list of make(1) variables for the release build. r277447: Remove hw.vga.textmode=1 from the VM image loader.conf, which was included during test builds and not intended to be included when merging this project branch back to head. r277455: Remove mk-azure.sh, which is no longer needed. MFC after: 1 month X-MFC-To: stable/10 (requires mkimg(1)) Help from: cperciva, swills Relnotes: yes Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=277458
Diffstat (limited to 'release/amd64')
-rwxr-xr-xrelease/amd64/mk-azure.sh173
-rwxr-xr-xrelease/amd64/mk-vmimage.sh197
2 files changed, 0 insertions, 370 deletions
diff --git a/release/amd64/mk-azure.sh b/release/amd64/mk-azure.sh
deleted file mode 100755
index 45b70ae73a1d..000000000000
--- a/release/amd64/mk-azure.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2014 The FreeBSD Foundation
-# All rights reserved.
-#
-# This software was developed by Glen Barber under sponsorship
-# from the FreeBSD Foundation.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# mk-azure.sh: Create virtual machine disk images for Microsoft Azure
-#
-# $FreeBSD$
-#
-
-export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin"
-
-usage() {
- echo "Usage:"
- echo -n "$(basename ${0}) vm-azure <base image>"
- echo " <source tree> <dest dir> <disk image size> <vm image name>"
- exit 1
-}
-
-panic() {
- msg="${@}"
- printf "${msg}\n"
- if [ ! -z "${mddev}" ]; then
- mdconfig -d -u ${mddev}
- fi
- # Do not allow one failure case to chain through any remaining image
- # builds.
- exit 0
-}
-
-vm_create_azure() {
- # Arguments:
- # vm-azure <base image> <source tree> <dest dir> <disk image size> <vm image name>
-
- VMBASE="${1}"
- WORLDDIR="${2}"
- DESTDIR="${3}"
- VMSIZE="${4}"
- VMIMAGE="${5}"
-
- if [ -z "${VMBASE}" -o -z "${WORLDDIR}" -o -z "${DESTDIR}" \
- -o -z "${VMSIZE}" -o -z "${VMIMAGE}" ]; then
- usage
- fi
-
- trap "umount ${DESTDIR}/dev ${DESTDIR}" INT QUIT TRAP ABRT TERM
-
- i=0
- mkdir -p ${DESTDIR}
- truncate -s ${VMSIZE} ${VMBASE}
- mddev=$(mdconfig -f ${VMBASE})
- newfs -j /dev/${mddev}
- mkdir -p ${DESTDIR}
- mount /dev/${mddev} ${DESTDIR}
- make -C ${WORLDDIR} DESTDIR=$(realpath ${DESTDIR}) \
- installworld installkernel distribution || \
- panic 1 "\n\nCannot install the base system to ${DESTDIR}."
- mount -t devfs devfs ${DESTDIR}/dev
- chroot ${DESTDIR} /usr/bin/newaliases
- echo '# Custom /etc/fstab for FreeBSD VM images' \
- > ${DESTDIR}/etc/fstab
- echo '/dev/gpt/rootfs / ufs rw 2 2' \
- >> ${DESTDIR}/etc/fstab
- # Although a swap partition is created, it is not used in Azure.
- echo '#/dev/gpt/swapfs none swap sw 0 0' \
- >> ${DESTDIR}/etc/fstab
-
- chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart
- chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes /usr/sbin/pkg bootstrap -y
- chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes /usr/sbin/pkg install -y \
- python python2 python27 py27-asn1 sudo bash
- if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then
- chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes /usr/sbin/pkg install -y \
- ${VM_EXTRA_PACKAGES}
- fi
-
- fetch -o ${DESTDIR}/usr/sbin/waagent \
- http://people.freebsd.org/~gjb/waagent
- chmod +x ${DESTDIR}/usr/sbin/waagent
- rm -f ${DESTDIR}/etc/resolv.conf
- chroot ${DESTDIR} /usr/sbin/waagent -verbose -install
- yes | chroot ${DESTDIR} /usr/sbin/waagent -deprovision
- echo 'sshd_enable="YES"' > ${DESTDIR}/etc/rc.conf
- echo 'ifconfig_hn0="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
- echo 'waagent_enable="YES"' >> ${DESTDIR}/etc/rc.conf
-
- echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf
- echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf
-
- if [ ! -z "${VM_RC_LIST}" ]; then
- for _rcvar in ${VM_RC_LIST}; do
- echo ${_rcvar}_enable="YES" >> ${DESTDIR}/etc/rc.conf
- done
- fi
-
- sync
-
- while ! umount ${DESTDIR}/dev ${DESTDIR}; do
- i=$(( $i + 1 ))
- if [ $i -ge 10 ]; then
- # This should never happen. But, it has happened.
- msg="Cannot umount(8) ${DESTDIR}\n"
- msg="${msg}Something has gone horribly wrong."
- panic 1 "${msg}"
- fi
- sleep 1
- done
-
- echo "Creating image... Please wait."
-
- mkimg -f vhdf -s gpt \
- -b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \
- -p freebsd-swap/swapfs::1G \
- -p freebsd-ufs/rootfs:=${VMBASE} \
- -o ${VMIMAGE}.raw
-
- if [ ! -x "/usr/local/bin/qemu-img" ]; then
- env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-devel
- fi
-
- size=$(qemu-img info -f raw --output json ${VMIMAGE}.raw | awk '/virtual-size/ {print $2}' | tr -d ',')
- size=$(( ( ${size} / ( 1024 * 1024 ) + 1 ) * ( 1024 * 1024 ) ))
- qemu-img resize ${VMIMAGE}.raw ${size}
- qemu-img convert -f raw -o subformat=fixed -O vpc ${VMIMAGE}.raw ${VMIMAGE}
-
- return 0
-}
-
-main() {
- cmd="${1}"
- shift 1
-
- if [ -e "${AZURECONF}" -a ! -c "${AZURECONF}" ]; then
- . ${AZURECONF}
- fi
-
- case ${cmd} in
- vm-azure)
- eval vm_create_azure "$@" || return 0
- ;;
- *|\?)
- usage
- ;;
- esac
-
- return 0
-}
-
-main "$@"
diff --git a/release/amd64/mk-vmimage.sh b/release/amd64/mk-vmimage.sh
deleted file mode 100755
index b3ffd232f848..000000000000
--- a/release/amd64/mk-vmimage.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2014 The FreeBSD Foundation
-# All rights reserved.
-#
-# This software was developed by Glen Barber under sponsorship
-# from the FreeBSD Foundation.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# mk-vmimage.sh: Create virtual machine disk images in various formats.
-#
-# $FreeBSD$
-#
-
-PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-export PATH
-
-usage_vm_base() {
- echo -n "$(basename ${0}) vm-base <base image> <source tree>"
- echo " <dest dir> <disk image size>"
- return 0
-}
-
-usage_vm_image() {
- echo -n "$(basename ${0}) vm-image <base image> <image format>"
- echo " <output image>"
- return 0
-}
-
-usage() {
- echo "Usage:"
- echo "$(basename ${0}) [vm-base|vm-image] [...]"
- echo
- usage_vm_base
- echo
- usage_vm_image
- exit 1
-}
-
-panic() {
- msg="${@}"
- printf "${msg}\n"
- if [ ! -z "${mddev}" ]; then
- mdconfig -d -u ${mddev}
- fi
- case ${cmd} in
- vm-base)
- # If the vm-base target fails, the vm-image target
- # cannot possibly succeed. Touch the .TARGET file
- # so it is not attempted.
- touch vm-image
- ;;
- *)
- # FALLTHROUGH
- ;;
- esac
- # Do not allow one failure case to chain through any remaining image
- # builds.
- return 1
-}
-
-vm_create_baseimage() {
- # Creates the UFS root filesystem for the virtual machine disk,
- # written to the formatted disk image with mkimg(1).
- #
- # Arguments:
- # vm-base <base image> <source tree> <dest dir> <disk image size>
-
- VMBASE="${1}"
- WORLDDIR="${2}"
- DESTDIR="${3}"
- VMSIZE="${4}"
-
- if [ -z "${VMBASE}" -o -z "${WORLDDIR}" -o -z "${DESTDIR}" \
- -o -z "${VMSIZE}" ]; then
- usage
- fi
-
- i=0
- mkdir -p ${DESTDIR}
- truncate -s ${VMSIZE} ${VMBASE}
- mddev=$(mdconfig -f ${VMBASE})
- newfs -j /dev/${mddev}
- mount /dev/${mddev} ${DESTDIR}
- cd ${WORLDDIR} && \
- make DESTDIR=${DESTDIR} \
- installworld installkernel distribution || \
- panic "\n\nCannot install the base system to ${DESTDIR}."
- chroot ${DESTDIR} /usr/bin/newaliases
- echo '# Custom /etc/fstab for FreeBSD VM images' \
- > ${DESTDIR}/etc/fstab
- echo '/dev/gpt/rootfs / ufs rw 2 2' \
- >> ${DESTDIR}/etc/fstab
- echo '/dev/gpt/swapfs none swap sw 0 0' \
- >> ${DESTDIR}/etc/fstab
- sync
- while ! umount ${DESTDIR}; do
- i=$(( $i + 1 ))
- if [ $i -ge 10 ]; then
- # This should never happen. But, it has happened.
- msg="Cannot umount(8) ${DESTDIR}\n"
- msg="${msg}Something has gone horribly wrong."
- panic "${msg}"
- fi
- sleep 1
- done
-
- return 0
-}
-
-vm_create_vmdisk() {
- # Creates the virtual machine disk image from the raw disk image.
- #
- # Arguments:
- # vm-image <base image> <image format> <output image>"
-
- VMBASE="${1}"
- FORMAT="${2}"
- VMIMAGE="${3}"
-
- if [ -z "${VMBASE}" -o -z "${FORMAT}" -o -z "${VMIMAGE}" ]; then
- usage
- fi
-
- mkimg_version=$(mkimg --version 2>/dev/null | awk '{print $2}')
-
- # We need mkimg(1) '--version' output, at minimum, to be able to
- # tell what virtual machine disk image formats are available.
- # Bail if mkimg(1) reports an empty '--version' value.
- if [ -z "${mkimg_version}" ]; then
- msg="Cannot determine mkimg(1) version.\n"
- msg="${msg}Cannot continue without a known mkimg(1) version."
- panic "${msg}"
- fi
-
- if ! mkimg --formats 2>/dev/null | grep -q ${FORMAT}; then
- panic "'${FORMAT}' is not supported by this mkimg(1).\n"
- fi
-
- case ${FORMAT} in
- vhd)
- mkimg_format=vhdf
- ;;
- *)
- mkimg_format=${FORMAT}
- ;;
- esac
-
- mkimg -f ${mkimg_format} -s gpt \
- -b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \
- -p freebsd-swap/swapfs::1G \
- -p freebsd-ufs/rootfs:=${VMBASE} \
- -o ${VMIMAGE}
-
- return 0
-}
-
-main() {
- cmd="${1}"
- shift 1
-
- case ${cmd} in
- vm-base)
- eval vm_create_baseimage "$@" || return 0
- ;;
- vm-image)
- eval vm_create_vmdisk "$@" || return 0
- ;;
- *|\?)
- usage
- ;;
- esac
-
- return 0
-}
-
-main "$@"