mirror of
https://github.com/opnsense/src.git
synced 2026-06-04 22:32:43 -04:00
c5342be39c
The vm_extra_pre_umount function in vmimage.subr served two purposes:
It removed /etc/resolv.conf and /qemu (if cross-building), and it
provided a function for cloudware to override in order to make cloud
specific changes to the filesystem before constructing a disk image.
This resulted in a number of bugs:
1. When cross-building, the emulator binary was left as /qemu in the
Azure, GCE, Openstack and Vagrant images.
2. The build host's resolv.conf was left as /etc/resolv.conf in the
basic-ci and basic-cloudinit images.
3. When building GCE images, a Google-specific resolv.conf file was
constructed, and then deleted before the disk image was created.
Move the bits needed for running code inside a VM staging directory
from vm_install_base into a new vm_emulation_setup routine, and move
the corresponding cleanup bits from vm_extra_pre_umount to a new
vm_emulation_cleanup routine.
Remove the /qemu and /etc/resolv.conf cleanups from the cloudware
configuration files (where they exist) since we will now be running
vm_emulation_cleanup to remove those even when vm_extra_pre_umount
has been overridden.
Override vm_emulation_cleanup in gce.conf since in that one case (and
*only* that one case) we don't want to clean up resolv.conf (since it
was constructed for the VM image rather than copied from the host).
releng/14.1 candidate.
MFC after: 1 week
Sponsored by: https://www.patreon.com/cperciva
(cherry picked from commit 0b1c5628c7)
115 lines
2.7 KiB
Bash
Executable file
115 lines
2.7 KiB
Bash
Executable file
#!/bin/sh
|
|
#-
|
|
# Copyright (c) 2014, 2015 The FreeBSD Foundation
|
|
#
|
|
# 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.
|
|
#
|
|
#
|
|
|
|
usage() {
|
|
echo "${0} usage:"
|
|
echo "${@}"
|
|
return 1
|
|
}
|
|
|
|
main() {
|
|
local arg
|
|
VMCONFIG="/dev/null"
|
|
while getopts "C:c:d:F:f:i:o:s:S:" arg; do
|
|
case "${arg}" in
|
|
C)
|
|
VMBUILDCONF="${OPTARG}"
|
|
;;
|
|
c)
|
|
VMCONFIG="${OPTARG}"
|
|
;;
|
|
d)
|
|
DESTDIR="${OPTARG}"
|
|
;;
|
|
F)
|
|
VMFS="${OPTARG}"
|
|
;;
|
|
f)
|
|
VMFORMAT="${OPTARG}"
|
|
;;
|
|
i)
|
|
VMBASE="${OPTARG}"
|
|
;;
|
|
o)
|
|
VMIMAGE="${OPTARG}"
|
|
;;
|
|
s)
|
|
VMSIZE="${OPTARG}"
|
|
;;
|
|
S)
|
|
WORLDDIR="${OPTARG}"
|
|
;;
|
|
*)
|
|
;;
|
|
esac
|
|
done
|
|
shift $(( ${OPTIND} - 1))
|
|
|
|
if [ -z "${VMBASE}" -o \
|
|
-z "${WORLDDIR}" -o \
|
|
-z "${DESTDIR}" -o \
|
|
-z "${VMSIZE}" -o \
|
|
-z "${VMIMAGE}" -o \
|
|
-z "${VMFS}" ];
|
|
then
|
|
usage || exit 0
|
|
fi
|
|
|
|
if [ -z "${VMBUILDCONF}" ] || [ ! -e "${VMBUILDCONF}" ]; then
|
|
echo "Must provide the path to vmimage.subr."
|
|
return 1
|
|
fi
|
|
|
|
. "${VMBUILDCONF}"
|
|
|
|
if [ ! -z "${VMCONFIG}" ] && [ ! -c "${VMCONFIG}" ]; then
|
|
. "${VMCONFIG}"
|
|
fi
|
|
|
|
vm_create_base
|
|
vm_install_base
|
|
vm_emulation_setup
|
|
vm_extra_install_base
|
|
vm_extra_install_packages
|
|
vm_extra_install_ports
|
|
vm_extra_enable_services
|
|
vm_extra_pre_umount
|
|
vm_extra_pkg_rmcache
|
|
vm_emulation_cleanup
|
|
vm_copy_base
|
|
vm_create_disk || return 0
|
|
vm_extra_create_disk
|
|
|
|
return 0
|
|
}
|
|
|
|
main "$@"
|