summaryrefslogtreecommitdiffstats
path: root/tools/builder_defaults.sh
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-31 16:31:14 -0300
committerRenato Botelho <renato@netgate.com>2015-08-31 16:31:14 -0300
commit502db0bde9976bb7c4d950b759e61b8c6eb43582 (patch)
tree6cd64295875a4bd13d1a8fc7908226c88d00f9b4 /tools/builder_defaults.sh
parent3236b6f490fe1169b08869c8150f2cafe34614eb (diff)
downloadpfsense-502db0bde9976bb7c4d950b759e61b8c6eb43582.zip
pfsense-502db0bde9976bb7c4d950b759e61b8c6eb43582.tar.gz
Use modern pfSense.ovf template, remove unnecessary variables and use vmdktool to convert disk to a modern version
Diffstat (limited to 'tools/builder_defaults.sh')
-rw-r--r--tools/builder_defaults.sh15
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index ff47cb9..55d2882 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -201,15 +201,12 @@ export OVFTEMPLATE=${OVFTEMPLATE:-"${BUILDER_TOOLS}/templates/ovf/${PRODUCT_NAME
export OVFUFS=${OVFUFS:-"${PRODUCT_NAME}-disk1.ufs"}
# On disk name of VMDK file included in OVA
export OVFVMDK=${OVFVMDK:-"${PRODUCT_NAME}-disk1.vmdk"}
-# 10 gigabyte on disk VMDK size
-export OVADISKSIZE=${OVADISKSIZE:-"10737418240"}
-# first partition size (freebsd-ufs) GPT
-export OVA_FIRST_PART_SIZE=${OVA_FIRST_PART_SIZE:-"$((8*1024*1024*1024))"}
-# swap partition size (freebsd-swap) GPT -
-# remaining space of 10G-8G - 128 block beginning/loader
-export OVA_SWAP_PART_SIZE=${OVA_SWAP_PART_SIZE:-"4193725"}
-# 10737254400 = 10240MB = virtual box vmdk file size XXX grab this value from vbox creation
-export OVA_DISKSECTIONALLOCATIONUNITS=${OVA_DISKSECTIONALLOCATIONUNITS:-"10737254400"}
+# 8 gigabyte on disk VMDK size
+export VMDK_DISK_CAPACITY_IN_GB=${VMDK_DISK_CAPACITY_IN_GB:-"8"}
+# first partition size (freebsd-ufs)
+export OVA_FIRST_PART_SIZE=${OVA_FIRST_PART_SIZE:-"6g"}
+# swap partition size (freebsd-swap)
+export OVA_SWAP_PART_SIZE=${OVA_SWAP_PART_SIZE:-"2G"}
# Temporary place to save files
export OVA_TMP=${OVA_TMP:-"${SCRATCHDIR}/ova_tmp"}
# end of OVF
OpenPOWER on IntegriCloud