From 5148bd6ec5930dc8cba7b030dd274885ec42767f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= Date: Fri, 19 Mar 2010 16:11:37 +0100 Subject: [PATCH] Change disk image sizes from GB to MB. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Mohring Signed-off-by: Jan-Simon Möller --- build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build b/build index f6c671c..cfa5fda 100755 --- a/build +++ b/build @@ -199,9 +199,9 @@ Known Parameters: This must be set to the same value if the buildroot is re-used. --vmdisk-autosetup - --vmdisk-rootsize - --vmdisk-swapsize - --vmdisk-filesystem + --vmdisk-rootsize + --vmdisk-swapsize + --vmdisk-filesystem --vmdisk-force [forces (re-)setup] Enable automatic setup of VM root/swap files @@ -959,9 +959,9 @@ if test -z "$RUNNING_IN_VM" ; then if test -e "$VM_IMAGE" -a -e "$VM_SWAP" -a ! "$VMDISK_FORCE"; then echo "$BUILD_ROOT and $VM_SWAP present, skipping autosetup without --vmdisk-force being set." else - # assuming GB for size ! thus root=4 swap=1 + # assuming MB for size ! thus root=4096 swap=1024 # setup VM_IMAGE - dd if=/dev/zero of="$VM_IMAGE" bs=1 count=1 seek=$(( ${VMDISK_ROOTSIZE} * 1024 * 1024 * 1024 )) || cleanup_and_exit 3 + dd if=/dev/zero of="$VM_IMAGE" bs=1 count=1 seek=$(( ${VMDISK_ROOTSIZE} * 1024 * 1024 )) || cleanup_and_exit 3 if test -z "$CLEAN_BUILD"; then $vm_img_mkfs $VM_IMAGE || cleanup_and_exit 3 if test -n "$vm_img_tunefs" ; then @@ -969,7 +969,7 @@ if test -z "$RUNNING_IN_VM" ; then fi fi # setup VM_SWAP - dd if=/dev/zero of="$VM_SWAP" bs=1 count=1 seek=$(( ${VMDISK_SWAPSIZE} * 1024 * 1024 * 1024 )) || cleanup_and_exit 3 + dd if=/dev/zero of="$VM_SWAP" bs=1 count=1 seek=$(( ${VMDISK_SWAPSIZE} * 1024 * 1024 )) || cleanup_and_exit 3 if test -z "$CLEAN_BUILD"; then mkswap "$VM_SWAP" || cleanup_and_exit 3 fi -- 2.7.4