aboutsummaryrefslogtreecommitdiff
path: root/release/amd64
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-10-14 11:20:08 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-10-14 11:20:08 +0000
commit41a29c1ab299473db6127dbe4abb352c1fd40afb (patch)
tree53deea7c759ed319e3c2e9aebad5ad13e628a8af /release/amd64
parent648326ad2d336d041c6d8163cb095c7b0a7efb20 (diff)
downloadsrc-41a29c1ab299473db6127dbe4abb352c1fd40afb.tar.gz
src-41a29c1ab299473db6127dbe4abb352c1fd40afb.zip
Revert r272793, r272794, r272795:
Remove implementation of vm_prebuild_setup(), vm_setup(), and vm_postbuild_setup(). It does not scale well, and I am not happy with their implementation. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-vmimage/; revision=273074
Diffstat (limited to 'release/amd64')
-rwxr-xr-xrelease/amd64/mk-vmimage.sh40
1 files changed, 0 insertions, 40 deletions
diff --git a/release/amd64/mk-vmimage.sh b/release/amd64/mk-vmimage.sh
index de233163d6de..b3ffd232f848 100755
--- a/release/amd64/mk-vmimage.sh
+++ b/release/amd64/mk-vmimage.sh
@@ -35,18 +35,6 @@
PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
export PATH
-vm_prebuild_setup() {
- return 0
-}
-
-vm_setup() {
- return 0
-}
-
-vm_postbuild_setup() {
- return 0
-}
-
usage_vm_base() {
echo -n "$(basename ${0}) vm-base <base image> <source tree>"
echo " <dest dir> <disk image size>"
@@ -92,9 +80,6 @@ panic() {
}
vm_create_baseimage() {
- # Run anything that is needed before the virtual machine disk image
- # is created.
- vm_prebuild_setup
# Creates the UFS root filesystem for the virtual machine disk,
# written to the formatted disk image with mkimg(1).
#
@@ -128,9 +113,6 @@ vm_create_baseimage() {
>> ${DESTDIR}/etc/fstab
echo '/dev/gpt/swapfs none swap sw 0 0' \
>> ${DESTDIR}/etc/fstab
- # Run anything that is needed while the virtual machine disk image
- # userland filesystem is still mounted as a md(4) device.
- vm_setup
sync
while ! umount ${DESTDIR}; do
i=$(( $i + 1 ))
@@ -190,35 +172,13 @@ vm_create_vmdisk() {
-p freebsd-ufs/rootfs:=${VMBASE} \
-o ${VMIMAGE}
- # Run anything that is needed for the virtual machine disk image
- # after it has been created.
- vm_postbuild_setup
return 0
}
main() {
- vm_config=
- while getopts "c:" arg; do
- case ${arg} in
- c)
- vm_config="${OPTARG}"
- ;;
- *)
- ;;
- esac
- done
- shift $(( ${OPTIND} - 1 ))
-
cmd="${1}"
shift 1
- if [ ! -z "${vm_config}" ]; then
- if [ ! -e "${vm_config}" ]; then
- panic "Configuration file ${vm_config} not found."
- fi
- . ${vm_config}
- fi
-
case ${cmd} in
vm-base)
eval vm_create_baseimage "$@" || return 0