mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 14:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(vm_image_util): Fix building vagrant vmware fusion images.

Browse Source
This commit is contained in:
Michael Marineau 2014-04-29 03:37:09 -04:00
parent 10d98e7b32
commit 3fdfe92b5d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_library/vm_image_util.sh
View File

@ -535,7 +535,10 @@ usb.generic.autoconnect = "FALSE"
usb.present = "TRUE" usb.present = "TRUE"
rtc.diffFromUTC = 0 rtc.diffFromUTC = 0
EOF EOF
VM_GENERATED_FILES+=( "${vmx_path}" ) # Only upload the vmx if it won't be bundled
if [[ -z "$(_get_vm_opt BUNDLE_FORMAT)" ]]; then
VM_GENERATED_FILES+=( "${vmx_path}" )
fi
} }
_write_vmware_zip_conf() { _write_vmware_zip_conf() {
@ -722,6 +725,11 @@ _write_box_bundle() {
mv "${VM_DST_IMG}" "${VM_TMP_DIR}/box" mv "${VM_DST_IMG}" "${VM_TMP_DIR}/box"
tar -czf "${box}" -C "${VM_TMP_DIR}/box" . tar -czf "${box}" -C "${VM_TMP_DIR}/box" .
local provider="virtualbox"
if [[ "${VM_IMG_TYPE}" == vagrant_vmware_fusion ]]; then
provider="vmware_fusion"
fi
cat >"${json}" <<EOF cat >"${json}" <<EOF
{ {
"name": "coreos-alpha", "name": "coreos-alpha",
@ -729,7 +737,7 @@ _write_box_bundle() {
"versions": [{ "versions": [{
"version": "${COREOS_VERSION_ID}", "version": "${COREOS_VERSION_ID}",
"providers": [{ "providers": [{
"name": "virtualbox", "name": "${provider}",
"url": "$(download_image_url "$(_dst_name ".box")")", "url": "$(download_image_url "$(_dst_name ".box")")",
"checksum_type": "sha256", "checksum_type": "sha256",
"checksum": "$(sha256sum "${box}" | awk '{print $1}')" "checksum": "$(sha256sum "${box}" | awk '{print $1}')"